Merge branch...

Merge branch '417446-build-interim-solution-for-conflicting-settings-page-titles-in-the-pinned-section' into 'master' 

Rename ambiguosly named settings in pinned section

See merge request https://gitlab.com/gitlab-org/gitlab/-/merge_requests/130840



Merged-by: Michael Lunøe <michael.lunoe@gmail.com>
Approved-by: Sascha Eggenberger <seggenberger@gitlab.com>
Approved-by: Michael Lunøe <michael.lunoe@gmail.com>
Approved-by: Nataliia Radina <nradina@gitlab.com>
Co-authored-by: Thomas Hutterer <thutterer@gitlab.com>

app/assets/javascripts/super_sidebar/components/pinned_section.vue

@@ -6,6 +6,13 @@ import { SIDEBAR_PINS_EXPANDED_COOKIE, SIDEBAR_COOKIE_EXPIRATION } from '../cons
 import MenuSection from './menu_section.vue';
 import NavItem from './nav_item.vue';
+const AMBIGUOUS_SETTINGS = {
+  ci_cd: s__('Navigation|CI/CD settings'),
+  merge_request_settings: s__('Navigation|Merge requests settings'),
+  monitor: s__('Navigation|Monitor settings'),
+  repository: s__('Navigation|Repository settings'),
+};
+
 export default {
   i18n: {
     pinned: s__('Navigation|Pinned'),
@@ -32,7 +39,7 @@ export default {
   data() {
     return {
       expanded: getCookie(SIDEBAR_PINS_EXPANDED_COOKIE) !== 'false',
-      draggableItems: this.items,
+      draggableItems: this.renameSettings(this.items),
     };
   },
   computed: {
@@ -58,7 +65,7 @@ export default {
       });
     },
     items(newItems) {
-      this.draggableItems = newItems;
+      this.draggableItems = this.renameSettings(newItems);
     },
   },
   methods: {
@@ -71,6 +78,12 @@ export default {
         event.oldIndex < event.newIndex,
       );
     },
+    renameSettings(items) {
+      return items.map((i) => {
+        const title = AMBIGUOUS_SETTINGS[i.id] || i.title;
+        return { ...i, title };
+      });
+    },
   },
 };
 </script>

locale/gitlab.pot

@@ -30916,6 +30916,9 @@ msgstr ""
 msgid "Navigation|Build"
 msgstr ""
+msgid "Navigation|CI/CD settings"
+msgstr ""
+
 msgid "Navigation|Code"
 msgstr ""
@@ -30952,9 +30955,15 @@ msgstr ""
 msgid "Navigation|Manage"
 msgstr ""
+msgid "Navigation|Merge requests settings"
+msgstr ""
+
 msgid "Navigation|Monitor"
 msgstr ""
+msgid "Navigation|Monitor settings"
+msgstr ""
+
 msgid "Navigation|No group matches found"
 msgstr ""
@@ -30979,6 +30988,9 @@ msgstr ""
 msgid "Navigation|Projects you visit often will appear here."
 msgstr ""
+msgid "Navigation|Repository settings"
+msgstr ""
+
 msgid "Navigation|Retrieving search results"
 msgstr ""

spec/frontend/super_sidebar/components/pinned_section_spec.js

@@ -87,4 +87,33 @@ describe('PinnedSection component', () => {
       });
     });
   });
+
+  describe('ambiguous settings names', () => {
+    it('get renamed to be unambiguous', () => {
+      createWrapper({
+        items: [
+          { title: 'CI/CD', id: 'ci_cd' },
+          { title: 'Merge requests', id: 'merge_request_settings' },
+          { title: 'Monitor', id: 'monitor' },
+          { title: 'Repository', id: 'repository' },
+          { title: 'Repository', id: 'code' },
+          { title: 'Something else', id: 'not_a_setting' },
+        ],
+      });
+
+      expect(
+        wrapper
+          .findComponent(MenuSection)
+          .props('item')
+          .items.map((i) => i.title),
+      ).toEqual([
+        'CI/CD settings',
+        'Merge requests settings',
+        'Monitor settings',
+        'Repository settings',
+        'Repository',
+        'Something else',
+      ]);
+    });
+  });
 });