Add latest changes from gitlab-org/gitlab@master

1 files changed, 10 insertions, 18 deletions

diff --git a/app/assets/javascripts/boards/components/board_filtered_search.vue b/app/assets/javascripts/boards/components/board_filtered_search.vue
index 91dd5c81f77..9443154999b 100644
--- a/app/assets/javascripts/boards/components/board_filtered_search.vue
+++ b/app/assets/javascripts/boards/components/board_filtered_search.vue
@@ -2,7 +2,7 @@
 import { pickBy, isEmpty, mapValues } from 'lodash';
 // eslint-disable-next-line no-restricted-imports
 import { mapActions } from 'vuex';
-import { getIdFromGraphQLId, isGid, convertToGraphQLId } from '~/graphql_shared/utils';
+import { getIdFromGraphQLId, isGid } from '~/graphql_shared/utils';
 import { convertObjectPropsToCamelCase } from '~/lib/utils/common_utils';
 import { updateHistory, setUrlParams, queryToObject } from '~/lib/utils/url_utility';
 import { __ } from '~/locale';
@@ -24,7 +24,6 @@ import {
 } from '~/vue_shared/components/filtered_search_bar/constants';
 import FilteredSearch from '~/vue_shared/components/filtered_search_bar/filtered_search_bar_root.vue';
 import { AssigneeFilterType, GroupByParamType } from 'ee_else_ce/boards/constants';
-import { TYPENAME_ITERATION } from '~/graphql_shared/constants';
 import eventHub from '../eventhub';
 
 export default {
@@ -342,18 +341,6 @@ export default {
         },
       );
     },
-    formattedFilterParams() {
-      const rawFilterParams = queryToObject(window.location.search, { gatherArrays: true });
-      const filtersCopy = convertObjectPropsToCamelCase(rawFilterParams, {});
-      if (this.filterParams?.iterationId) {
-        filtersCopy.iterationId = convertToGraphQLId(
-          TYPENAME_ITERATION,
-          this.filterParams.iterationId,
-        );
-      }
-
-      return filtersCopy;
-    },
   },
   created() {
     eventHub.$on('updateTokens', this.updateTokens);
@@ -367,10 +354,15 @@ export default {
   },
   methods: {
     ...mapActions(['performSearch']),
-    updateTokens() {
+    formattedFilterParams() {
       const rawFilterParams = queryToObject(window.location.search, { gatherArrays: true });
-      this.filterParams = convertObjectPropsToCamelCase(rawFilterParams, {});
-      this.$emit('setFilters', this.formattedFilterParams);
+      const filtersCopy = convertObjectPropsToCamelCase(rawFilterParams, {});
+      this.filterParams = filtersCopy;
+
+      return filtersCopy;
+    },
+    updateTokens() {
+      this.$emit('setFilters', this.formattedFilterParams());
       this.filteredSearchKey += 1;
     },
     handleFilter(filters) {
@@ -383,7 +375,7 @@ export default {
       });
 
       if (this.isApolloBoard) {
-        this.$emit('setFilters', this.formattedFilterParams);
+        this.$emit('setFilters', this.formattedFilterParams());
       } else {
         this.performSearch();
       }