Add latest changes from gitlab-org/gitlab@master

1 files changed, 2 insertions, 6 deletions

diff --git a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/iteration_token.vue b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/iteration_token.vue
index aff93ebc9c0..4a1dbf9d3fe 100644
--- a/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/iteration_token.vue
+++ b/app/assets/javascripts/vue_shared/components/filtered_search_bar/tokens/iteration_token.vue
@@ -1,7 +1,6 @@
 <script>
 import { GlDropdownDivider, GlDropdownSectionHeader, GlFilteredSearchSuggestion } from '@gitlab/ui';
 import createFlash from '~/flash';
-import { getIdFromGraphQLId } from '~/graphql_shared/utils';
 import { __ } from '~/locale';
 import BaseToken from '~/vue_shared/components/filtered_search_bar/tokens/base_token.vue';
 import { formatDate } from '~/lib/utils/datetime_utility';
@@ -43,7 +42,7 @@ export default {
   },
   methods: {
     getActiveIteration(iterations, data) {
-      return iterations.find((iteration) => this.getValue(iteration) === data);
+      return iterations.find((iteration) => iteration.id === data);
     },
     groupIterationsByCadence(iterations) {
       const cadences = [];
@@ -80,9 +79,6 @@ export default {
           this.loading = false;
         });
     },
-    getValue(iteration) {
-      return String(getIdFromGraphQLId(iteration.id));
-    },
     /**
      * TODO: https://gitlab.com/gitlab-org/gitlab/-/issues/344619
      * This method also exists as a utility function in ee/../iterations/utils.js
@@ -125,7 +121,7 @@ export default {
         <gl-filtered-search-suggestion
           v-for="iteration in cadence.iterations"
           :key="iteration.id"
-          :value="getValue(iteration)"
+          :value="iteration.id"
         >
           {{ iteration.title }}
           <div v-if="glFeatures.iterationCadences" class="gl-text-gray-400">