Merge branch 'revert-805a2f03' into 'master'

Revert "Merge branch '341121-fix-sidebar-labels-bug' into 'master'"

See merge request gitlab-org/gitlab!72595

app/assets/javascripts/vue_shared/components/sidebar/labels_select_vue/store/mutations.js

@@ -69,8 +69,7 @@ export default {
     if (isScopedLabel(candidateLabel)) {
       const scopedKeyWithDelimiter = `${scopedLabelKey(candidateLabel)}${SCOPED_LABEL_DELIMITER}`;
       const currentActiveScopedLabel = state.labels.find(
-        ({ set, title }) =>
-          set && title.startsWith(scopedKeyWithDelimiter) && title !== candidateLabel.title,
+        ({ title }) => title.startsWith(scopedKeyWithDelimiter) && title !== candidateLabel.title,
       );
 
       if (currentActiveScopedLabel) {

spec/frontend/vue_shared/components/sidebar/labels_select_vue/store/mutations_spec.js

@@ -159,9 +159,8 @@ describe('LabelsSelect Mutations', () => {
       labels = [
         { id: 1, title: 'scoped' },
         { id: 2, title: 'scoped::one', set: false },
-        { id: 3, title: 'scoped::two', set: false },
-        { id: 4, title: 'scoped::three', set: true },
-        { id: 5, title: '' },
+        { id: 3, title: 'scoped::test', set: true },
+        { id: 4, title: '' },
       ];
     });
 
@@ -192,9 +191,8 @@ describe('LabelsSelect Mutations', () => {
         expect(state.labels).toEqual([
           { id: 1, title: 'scoped' },
           { id: 2, title: 'scoped::one', set: true, touched: true },
-          { id: 3, title: 'scoped::two', set: false },
-          { id: 4, title: 'scoped::three', set: false },
-          { id: 5, title: '' },
+          { id: 3, title: 'scoped::test', set: false },
+          { id: 4, title: '' },
         ]);
       });
     });