Merge branch 'yo-canary-shortcut' into 'master'

Keyboard shortcut for switching to GitLab next (Canary)

See merge request gitlab-org/gitlab!51834

app/assets/javascripts/behaviors/shortcuts/keybindings.js

@@ -29,6 +29,7 @@ export const customizations = parsedCustomizations;
 
 // All available commands
 export const TOGGLE_PERFORMANCE_BAR = 'globalShortcuts.togglePerformanceBar';
+export const TOGGLE_CANARY = 'globalShortcuts.toggleCanary';
 
 /** All keybindings, grouped and ordered with descriptions */
 export const keybindingGroups = [
@@ -42,6 +43,12 @@ export const keybindingGroups = [
         // eslint-disable-next-line @gitlab/require-i18n-strings
         defaultKeys: ['p b'],
       },
+      {
+        description: s__('KeyboardShortcuts|Toggle GitLab Next'),
+        command: TOGGLE_CANARY,
+        // eslint-disable-next-line @gitlab/require-i18n-strings
+        defaultKeys: ['g x'],
+      },
     ],
   },
 ]

app/assets/javascripts/behaviors/shortcuts/shortcuts.js

@@ -9,7 +9,7 @@ import axios from '../../lib/utils/axios_utils';
 import { refreshCurrentPage, visitUrl } from '../../lib/utils/url_utility';
 import findAndFollowLink from '../../lib/utils/navigation_utility';
 import { parseBoolean, getCspNonceValue } from '~/lib/utils/common_utils';
-import { keysFor, TOGGLE_PERFORMANCE_BAR } from './keybindings';
+import { keysFor, TOGGLE_PERFORMANCE_BAR, TOGGLE_CANARY } from './keybindings';
 
 const defaultStopCallback = Mousetrap.prototype.stopCallback;
 Mousetrap.prototype.stopCallback = function customStopCallback(e, element, combo) {
@@ -72,6 +72,7 @@ export default class Shortcuts {
     Mousetrap.bind('/', Shortcuts.focusSearch);
     Mousetrap.bind('f', this.focusFilter.bind(this));
     Mousetrap.bind(keysFor(TOGGLE_PERFORMANCE_BAR), Shortcuts.onTogglePerfBar);
+    Mousetrap.bind(keysFor(TOGGLE_CANARY), Shortcuts.onToggleCanary);
 
     const findFileURL = document.body.dataset.findFile;
 
@@ -124,6 +125,14 @@ export default class Shortcuts {
     refreshCurrentPage();
   }
 
+  static onToggleCanary(e) {
+    e.preventDefault();
+    const canaryCookieName = 'gitlab_canary';
+    const currentValue = parseBoolean(Cookies.get(canaryCookieName));
+    Cookies.set(canaryCookieName, (!currentValue).toString(), { expires: 365, path: '/' });
+    refreshCurrentPage();
+  }
+
   static toggleMarkdownPreview(e) {
     // Check if short-cut was triggered while in Write Mode
     const $target = $(e.target);

app/views/help/_shortcuts.html.haml

@@ -60,6 +60,12 @@
                     %kbd p
                     %kbd b
                   %td= _('Toggle the Performance Bar')
+                - if Gitlab.com?
+                  %tr
+                    %td.shortcut
+                      %kbd g
+                      %kbd x
+                    %td= _('Toggle GitLab Next')
               %tbody
                 %tr
                   %th

changelogs/unreleased/yo-canary-shortcut.yml

+---
+title: Keyboard shortcut for switching to GitLab next (Canary)
+merge_request: 51834
+author: Yogi (@yo)
+type: added

locale/gitlab.pot

@@ -16406,6 +16406,9 @@ msgstr ""
 msgid "KeyboardShortcuts|Global Shortcuts"
 msgstr ""
 
+msgid "KeyboardShortcuts|Toggle GitLab Next"
+msgstr ""
+
 msgid "KeyboardShortcuts|Toggle the Performance Bar"
 msgstr ""
 
@@ -29907,6 +29910,9 @@ msgstr ""
 msgid "Today"
 msgstr ""
 
+msgid "Toggle GitLab Next"
+msgstr ""
+
 msgid "Toggle Markdown preview"
 msgstr ""