Add latest changes from gitlab-org/gitlab@master

Author: GitLab Bot

GITALY_SERVER_VERSION

@@ -1 +1 @@
-6bd8110489a44adeacff1897a757d8ea52bf4f87
+ee1bf60a8952f6e9b4f3bf7627ac671ef1427cad

GITLAB_SHELL_VERSION

@@ -1 +1 @@
-14.40.0
+14.41.0

app/assets/javascripts/diffs/components/app.vue

@@ -4,6 +4,7 @@ import { GlBreakpointInstance as bp } from '@gitlab/ui/dist/utils';
 import { debounce, throttle } from 'lodash';
 // eslint-disable-next-line no-restricted-imports
 import { mapState, mapGetters, mapActions } from 'vuex';
+import { mapState as mapPiniaState, mapActions as mapPiniaActions } from 'pinia';
 import FindingsDrawer from 'ee_component/diffs/components/shared/findings_drawer.vue';
 import glFeatureFlagsMixin from '~/vue_shared/mixins/gl_feature_flags_mixin';
 import { convertToGraphQLId } from '~/graphql_shared/utils';
@@ -18,7 +19,7 @@ import {
 import { createAlert } from '~/alert';
 import { InternalEvents } from '~/tracking';
 import { helpPagePath } from '~/helpers/help_page_helper';
-import { parseBoolean, handleLocationHash } from '~/lib/utils/common_utils';
+import { parseBoolean, handleLocationHash, getCookie } from '~/lib/utils/common_utils';
 import { BV_HIDE_TOOLTIP, DEFAULT_DEBOUNCE_AND_THROTTLE_MS } from '~/lib/utils/constants';
 import { Mousetrap } from '~/lib/mousetrap';
 import { updateHistory, getLocationHash } from '~/lib/utils/url_utility';
@@ -27,9 +28,9 @@ import { __ } from '~/locale';
 import notesEventHub from '~/notes/event_hub';
 import { DynamicScroller, DynamicScrollerItem } from 'vendor/vue-virtual-scroller';
 import getMRCodequalityAndSecurityReports from 'ee_else_ce/diffs/components/graphql/get_mr_codequality_and_security_reports.query.graphql';
+import { useFileBrowser } from '~/diffs/stores/file_browser';
 import { sortFindingsByFile } from '../utils/sort_findings_by_file';
 import {
-  MR_TREE_SHOW_KEY,
   ALERT_OVERFLOW_HIDDEN,
   ALERT_MERGE_CONFLICT,
   ALERT_COLLAPSED_FILES,
@@ -44,6 +45,7 @@ import {
   TRACKING_MULTIPLE_FILES_MODE,
   EVT_MR_PREPARED,
   EVT_DISCUSSIONS_ASSIGNED,
+  FILE_BROWSER_VISIBLE,
 } from '../constants';
 
 import { isCollapsed } from '../utils/diff_file';
@@ -243,7 +245,6 @@ export default {
       'showWhitespace',
       'targetBranchName',
       'branchName',
-      'showTreeList',
       'addedLines',
       'removedLines',
     ]),
@@ -259,6 +260,7 @@ export default {
     ]),
     ...mapGetters(['isNotesFetched', 'getNoteableData']),
     ...mapGetters('findingsDrawer', ['activeDrawer']),
+    ...mapPiniaState(useFileBrowser, ['fileBrowserVisible']),
     diffs() {
       if (!this.viewDiffsFileByFile) {
         return this.diffFiles;
@@ -316,7 +318,7 @@ export default {
       return convertToGraphQLId('MergeRequest', this.getNoteableData.id);
     },
     renderFileTree() {
-      return this.renderDiffFiles && this.showTreeList;
+      return this.renderDiffFiles && this.fileBrowserVisible;
     },
     hideTooltips() {
       const hide = () => {
@@ -455,19 +457,18 @@ export default {
       'setCurrentFileHash',
       'setHighlightedRow',
       'goToFile',
-      'setShowTreeList',
       'navigateToDiffFileIndex',
       'setFileByFile',
       'disableVirtualScroller',
       'fetchLinkedFile',
-      'toggleTreeList',
       'expandAllFiles',
       'collapseAllFiles',
       'setDiffViewType',
       'setShowWhitespace',
       'goToFile',
     ]),
     ...mapActions('findingsDrawer', ['setDrawer']),
+    ...mapPiniaActions(useFileBrowser, ['setFileBrowserVisibility', 'toggleFileBrowserVisibility']),
     closeDrawer() {
       this.setDrawer({});
     },
@@ -684,16 +685,14 @@ export default {
       }
     },
     setTreeDisplay() {
-      const storedTreeShow = localStorage.getItem(MR_TREE_SHOW_KEY);
-      let showTreeList = true;
-
-      if (storedTreeShow !== null) {
-        showTreeList = parseBoolean(storedTreeShow);
-      } else if (!bp.isDesktop() || (!this.isBatchLoading && this.flatBlobsList.length <= 1)) {
-        showTreeList = false;
+      const hideBrowserPreference = getCookie(FILE_BROWSER_VISIBLE);
+      if (hideBrowserPreference) {
+        this.setFileBrowserVisibility(parseBoolean(hideBrowserPreference));
+      } else {
+        const shouldHide =
+          !bp.isDesktop() || (!this.isBatchLoading && this.flatBlobsList.length <= 1);
+        this.setFileBrowserVisibility(!shouldHide);
       }
-
-      return this.setShowTreeList({ showTreeList, saving: false });
     },
     async scrollVirtualScrollerToFileHash(hash) {
       const index = this.diffFiles.findIndex((f) => f.file_hash === hash);
@@ -741,7 +740,7 @@ export default {
       }
     },
     fileTreeToggled() {
-      this.toggleTreeList();
+      this.toggleFileBrowserVisibility();
       this.adjustView();
     },
     isDiffViewActive(item) {

app/assets/javascripts/diffs/components/compare_versions.vue

@@ -10,6 +10,7 @@ import {
 } from '@gitlab/ui';
 // eslint-disable-next-line no-restricted-imports
 import { mapActions, mapGetters, mapState } from 'vuex';
+import { mapActions as mapPiniaActions, mapState as mapPiniaState } from 'pinia';
 import { __ } from '~/locale';
 import { setUrlParams } from '~/lib/utils/url_utility';
 import {
@@ -20,6 +21,7 @@ import {
 } from '~/behaviors/shortcuts/keybindings';
 import { shouldDisableShortcuts } from '~/behaviors/shortcuts/shortcuts_toggle';
 import { sanitize } from '~/lib/dompurify';
+import { useFileBrowser } from '~/diffs/stores/file_browser';
 import CompareDropdownLayout from './compare_dropdown_layout.vue';
 
 export default {
@@ -47,12 +49,13 @@ export default {
       'diffCompareDropdownTargetVersions',
       'diffCompareDropdownSourceVersions',
     ]),
-    ...mapState('diffs', ['commit', 'showTreeList', 'startVersion', 'latestVersionPath']),
+    ...mapState('diffs', ['commit', 'startVersion', 'latestVersionPath']),
+    ...mapPiniaState(useFileBrowser, ['fileBrowserVisible']),
     toggleFileBrowserShortcutKey() {
       return shouldDisableShortcuts() ? null : keysFor(MR_TOGGLE_FILE_BROWSER)[0];
     },
     toggleFileBrowserTitle() {
-      return this.showTreeList ? __('Hide file browser') : __('Show file browser');
+      return this.fileBrowserVisible ? __('Hide file browser') : __('Show file browser');
     },
     toggleFileBrowserTooltip() {
       const description = this.toggleFileBrowserTitle;
@@ -113,7 +116,7 @@ export default {
     },
   },
   methods: {
-    ...mapActions('diffs', ['setShowTreeList']),
+    ...mapPiniaActions(useFileBrowser, ['toggleFileBrowserVisibility']),
     ...mapActions('diffs', ['moveToNeighboringCommit']),
   },
 };
@@ -130,10 +133,10 @@ export default {
         data-testid="file-tree-button"
         :aria-label="toggleFileBrowserTitle"
         :aria-keyshortcuts="toggleFileBrowserShortcutKey"
-        :selected="showTreeList"
-        @click="setShowTreeList({ showTreeList: !showTreeList })"
+        :selected="fileBrowserVisible"
+        @click="toggleFileBrowserVisibility"
       >
-        <gl-animated-sidebar-icon :is-on="showTreeList" />
+        <gl-animated-sidebar-icon :is-on="fileBrowserVisible" />
       </gl-button>
       <div v-if="commit">
         {{ __('Viewing commit') }}

app/assets/javascripts/diffs/constants.js

@@ -28,7 +28,7 @@ export const LENGTH_OF_AVATAR_TOOLTIP = 17;
 export const DIFF_FILE_SYMLINK_MODE = '120000';
 export const DIFF_FILE_DELETED_MODE = '0';
 
-export const MR_TREE_SHOW_KEY = 'mr_tree_show';
+export const FILE_BROWSER_VISIBLE = 'file_browser_visible';
 
 export const TREE_TYPE = 'tree';
 export const TREE_LIST_STORAGE_KEY = 'mr_diff_tree_list';

app/assets/javascripts/diffs/store/actions.js

@@ -29,7 +29,6 @@ import {
 import {
   INLINE_DIFF_VIEW_TYPE,
   DIFF_VIEW_COOKIE_NAME,
-  MR_TREE_SHOW_KEY,
   TREE_LIST_STORAGE_KEY,
   OLD_LINE_KEY,
   NEW_LINE_KEY,
@@ -718,18 +717,6 @@ export const scrollToFile = ({ state, commit, getters }, { path }) => {
   }
 };
 
-export const setShowTreeList = ({ commit }, { showTreeList, saving = true }) => {
-  commit(types.SET_SHOW_TREE_LIST, showTreeList);
-
-  if (saving) {
-    localStorage.setItem(MR_TREE_SHOW_KEY, showTreeList);
-  }
-};
-
-export const toggleTreeList = ({ state, commit }) => {
-  commit(types.SET_SHOW_TREE_LIST, !state.showTreeList);
-};
-
 export const openDiffFileCommentForm = ({ commit, getters }, formData) => {
   const form = getters.getCommentFormForDiffFile(formData.fileHash);
 

app/assets/javascripts/diffs/store/modules/diff_state.js

@@ -25,7 +25,6 @@ export default () => ({
   diffViewType: INLINE_DIFF_VIEW_TYPE,
   tree: [],
   treeEntries: {},
-  showTreeList: true,
   currentDiffFileId: '',
   projectPath: '',
   viewedDiffFileIds: {},

app/assets/javascripts/diffs/store/mutation_types.js

@@ -23,7 +23,6 @@ export const REMOVE_LINE_DISCUSSIONS_FOR_FILE = 'REMOVE_LINE_DISCUSSIONS_FOR_FIL
 export const TOGGLE_FOLDER_OPEN = 'TOGGLE_FOLDER_OPEN';
 export const SET_FOLDER_OPEN = 'SET_FOLDER_OPEN';
 export const TREE_ENTRY_DIFF_LOADING = 'TREE_ENTRY_DIFF_LOADING';
-export const SET_SHOW_TREE_LIST = 'SET_SHOW_TREE_LIST';
 export const SET_CURRENT_DIFF_FILE = 'SET_CURRENT_DIFF_FILE';
 export const SET_DIFF_FILE_VIEWED = 'SET_DIFF_FILE_VIEWED';
 export const SET_LINKED_FILE_HASH = 'SET_LINKED_FILE_HASH';

app/assets/javascripts/diffs/store/mutations.js

@@ -297,9 +297,6 @@ export default {
   [types.TREE_ENTRY_DIFF_LOADING](state, { path, loading = true }) {
     state.treeEntries[path].diffLoading = loading;
   },
-  [types.SET_SHOW_TREE_LIST](state, showTreeList) {
-    state.showTreeList = showTreeList;
-  },
   [types.SET_CURRENT_DIFF_FILE](state, fileId) {
     state.currentDiffFileId = fileId;
   },

app/assets/javascripts/diffs/stores/file_browser.js

@@ -0,0 +1,26 @@
+import { defineStore } from 'pinia';
+import { getCookie, parseBoolean, setCookie } from '~/lib/utils/common_utils';
+import { FILE_BROWSER_VISIBLE } from '~/diffs/constants';
+
+export const useFileBrowser = defineStore('fileBrowser', {
+  state() {
+    return {
+      fileBrowserVisible: true,
+    };
+  },
+  actions: {
+    setFileBrowserVisibility(visible) {
+      this.fileBrowserVisible = visible;
+    },
+    toggleFileBrowserVisibility() {
+      this.fileBrowserVisible = !this.fileBrowserVisible;
+      setCookie(FILE_BROWSER_VISIBLE, this.fileBrowserVisible);
+    },
+    initFileBrowserVisibility() {
+      const visibilityPreference = getCookie(FILE_BROWSER_VISIBLE);
+      if (visibilityPreference) {
+        this.fileBrowserVisible = parseBoolean(visibilityPreference);
+      }
+    },
+  },
+});

app/assets/javascripts/diffs/stores/legacy_diffs/actions.js

@@ -30,7 +30,6 @@ import { useNotes } from '~/notes/store/legacy_notes';
 import {
   INLINE_DIFF_VIEW_TYPE,
   DIFF_VIEW_COOKIE_NAME,
-  MR_TREE_SHOW_KEY,
   TREE_LIST_STORAGE_KEY,
   OLD_LINE_KEY,
   NEW_LINE_KEY,
@@ -718,18 +717,6 @@ export function scrollToFile({ path }) {
   }
 }
 
-export function setShowTreeList({ showTreeList, saving = true }) {
-  this[types.SET_SHOW_TREE_LIST](showTreeList);
-
-  if (saving) {
-    localStorage.setItem(MR_TREE_SHOW_KEY, showTreeList);
-  }
-}
-
-export function toggleTreeList() {
-  this[types.SET_SHOW_TREE_LIST](!this.showTreeList);
-}
-
 export function openDiffFileCommentForm(formData) {
   const form = this.getCommentFormForDiffFile(formData.fileHash);
 

app/assets/javascripts/diffs/stores/legacy_diffs/index.js

@@ -36,7 +36,6 @@ export const useLegacyDiffs = defineStore('legacyDiffs', {
       diffViewType: INLINE_DIFF_VIEW_TYPE,
       tree: [],
       treeEntries: {},
-      showTreeList: true,
       currentDiffFileId: '',
       projectPath: '',
       viewedDiffFileIds: {},

app/assets/javascripts/diffs/stores/legacy_diffs/mutations.js

@@ -293,9 +293,6 @@ export default {
   [types.TREE_ENTRY_DIFF_LOADING]({ path, loading = true }) {
     this.treeEntries[path].diffLoading = loading;
   },
-  [types.SET_SHOW_TREE_LIST](showTreeList) {
-    this.showTreeList = showTreeList;
-  },
   [types.SET_CURRENT_DIFF_FILE](fileId) {
     this.currentDiffFileId = fileId;
   },

app/assets/javascripts/pages/projects/issues/show/index.js

@@ -1,3 +1,24 @@
-import { initShow } from '~/issues';
+import { issuableInitialDataById, isLegacyIssueType } from '~/issues/show/utils/issuable_data';
 
-initShow();
+const initLegacyIssuePage = async () => {
+  const [{ initShow }] = await Promise.all([import('~/issues')]);
+  initShow();
+};
+
+const initWorkItemPage = async () => {
+  const [{ initWorkItemsRoot }] = await Promise.all([import('~/work_items')]);
+
+  initWorkItemsRoot({ workItemType: 'issue' });
+};
+
+const issuableData = issuableInitialDataById('js-issuable-app');
+
+if (
+  !isLegacyIssueType(issuableData) &&
+  gon.features.workItemsViewPreference &&
+  gon.current_user_use_work_items_view
+) {
+  initWorkItemPage();
+} else {
+  initLegacyIssuePage();
+}

app/assets/javascripts/rapid_diffs/app/index.js

@@ -4,6 +4,7 @@ import { DiffFile } from '~/rapid_diffs/diff_file';
 import { DiffFileMounted } from '~/rapid_diffs/diff_file_mounted';
 import { useDiffsList } from '~/rapid_diffs/stores/diffs_list';
 import { initFileBrowser } from '~/rapid_diffs/app/init_file_browser';
+import { StreamingError } from '~/rapid_diffs/streaming_error';
 
 // This facade interface joins together all the bits and pieces of Rapid Diffs: DiffFile, Settings, File browser, etc.
 // It's a unified entrypoint for Rapid Diffs and all external communications should happen through this interface.
@@ -30,6 +31,7 @@ class RapidDiffsFacade {
   #registerCustomElements() {
     customElements.define('diff-file', this.DiffFileImplementation);
     customElements.define('diff-file-mounted', DiffFileMounted);
+    customElements.define('streaming-error', StreamingError);
   }
 }
 

app/assets/javascripts/rapid_diffs/streaming_error.js

@@ -0,0 +1,11 @@
+import { createAlert } from '~/alert';
+import { __ } from '~/locale';
+
+export class StreamingError extends HTMLElement {
+  connectedCallback() {
+    const message = __(`Could not fetch all changes. Try reloading the page.`);
+    // eslint-disable-next-line no-console
+    console.error(`Failed to stream diffs: ${this.getAttribute('message')}`);
+    createAlert({ message });
+  }
+}