Add latest changes from gitlab-org/gitlab@15-2-stable-eev15.2.0-rc42

11 files changed, 23 insertions, 33 deletions

diff --git a/app/assets/javascripts/repository/components/blob_content_viewer.vue b/app/assets/javascripts/repository/components/blob_content_viewer.vue
index 280455c3fed..bf4f19504f0 100644
--- a/app/assets/javascripts/repository/components/blob_content_viewer.vue
+++ b/app/assets/javascripts/repository/components/blob_content_viewer.vue
@@ -97,6 +97,7 @@ export default {
       project: DEFAULT_BLOB_INFO.project,
       gitpodEnabled: DEFAULT_BLOB_INFO.gitpodEnabled,
       currentUser: DEFAULT_BLOB_INFO.currentUser,
+      useFallback: false,
     };
   },
   computed: {
@@ -130,7 +131,7 @@ export default {
     },
     shouldLoadLegacyViewer() {
       const isTextFile = this.viewer.fileType === TEXT_FILE_TYPE && !this.glFeatures.highlightJs;
-      return isTextFile || LEGACY_FILE_TYPES.includes(this.blobInfo.fileType);
+      return isTextFile || LEGACY_FILE_TYPES.includes(this.blobInfo.fileType) || this.useFallback;
     },
     legacyViewerLoaded() {
       return (
@@ -173,6 +174,10 @@ export default {
     },
   },
   methods: {
+    onError() {
+      this.useFallback = true;
+      this.loadLegacyViewer();
+    },
     loadLegacyViewer() {
       if (this.legacyViewerLoaded) {
         return;
@@ -303,7 +308,7 @@ export default {
         :loading="isLoadingLegacyViewer"
         :data-loading="isRenderingLegacyTextViewer"
       />
-      <component :is="blobViewer" v-else :blob="blobInfo" class="blob-viewer" />
+      <component :is="blobViewer" v-else :blob="blobInfo" class="blob-viewer" @error="onError" />
       <code-intelligence
         v-if="blobViewer || legacyViewerLoaded"
         :code-navigation-path="blobInfo.codeNavigationPath"
diff --git a/app/assets/javascripts/repository/components/last_commit.vue b/app/assets/javascripts/repository/components/last_commit.vue
index d24d7648f1b..9f2cf8505d3 100644
--- a/app/assets/javascripts/repository/components/last_commit.vue
+++ b/app/assets/javascripts/repository/components/last_commit.vue
@@ -49,10 +49,11 @@ export default {
         };
       },
       update: (data) => {
-        const pipelines = data.project?.repository?.tree?.lastCommit?.pipelines?.edges;
+        const lastCommit = data.project?.repository?.paginatedTree?.nodes[0]?.lastCommit;
+        const pipelines = lastCommit?.pipelines?.edges;
 
         return {
-          ...data.project?.repository?.tree?.lastCommit,
+          ...lastCommit,
           pipeline: pipelines?.length && pipelines[0].node,
         };
       },
@@ -131,7 +132,9 @@ export default {
         :css-classes="'gl-mr-0!' /* NOTE: this is needed only while we migrate user-avatar-image to GlAvatar (7731 epics) */"
         :size="32"
       />
-      <div class="commit-detail flex-list">
+      <div
+        class="commit-detail flex-list gl-display-flex gl-justify-content-space-between gl-align-items-flex-start gl-flex-grow-1 gl-min-w-0"
+      >
         <div class="commit-content qa-commit-content">
           <gl-link
             v-safe-html:[$options.safeHtmlConfig]="commit.titleHtml"
diff --git a/app/assets/javascripts/repository/components/table/index.vue b/app/assets/javascripts/repository/components/table/index.vue
index 41f7a4b147f..1f6b5e98122 100644
--- a/app/assets/javascripts/repository/components/table/index.vue
+++ b/app/assets/javascripts/repository/components/table/index.vue
@@ -103,14 +103,12 @@ export default {
 
       return this.rowNumbers[key];
     },
-    getCommit(fileName, type) {
+    getCommit(fileName) {
       if (!this.glFeatures.lazyLoadCommits) {
         return {};
       }
 
-      return this.commits.find(
-        (commitEntry) => commitEntry.fileName === fileName && commitEntry.type === type,
-      );
+      return this.commits.find((commitEntry) => commitEntry.fileName === fileName);
     },
   },
 };
@@ -152,7 +150,7 @@ export default {
               :loading-path="loadingPath"
               :total-entries="totalEntries"
               :row-number="generateRowNumber(entry.flatPath, entry.id, index)"
-              :commit-info="getCommit(entry.name, entry.type)"
+              :commit-info="getCommit(entry.name)"
               v-on="$listeners"
             />
           </template>
diff --git a/app/assets/javascripts/repository/components/table/row.vue b/app/assets/javascripts/repository/components/table/row.vue
index 2b910109f7d..99b7395d6e7 100644
--- a/app/assets/javascripts/repository/components/table/row.vue
+++ b/app/assets/javascripts/repository/components/table/row.vue
@@ -43,7 +43,6 @@ export default {
       variables() {
         return {
           fileName: this.name,
-          type: this.type,
           path: this.currentPath,
           projectPath: this.projectPath,
           maxOffset: this.totalEntries,
@@ -135,14 +134,11 @@ export default {
     commitData() {
       return this.glFeatures.lazyLoadCommits ? this.commitInfo : this.commit;
     },
-    refactorBlobViewerEnabled() {
-      return this.glFeatures.refactorBlobViewer;
-    },
     routerLinkTo() {
       const blobRouteConfig = { path: `/-/blob/${this.escapedRef}/${escapeFileUrl(this.path)}` };
       const treeRouteConfig = { path: `/-/tree/${this.escapedRef}/${escapeFileUrl(this.path)}` };
 
-      if (this.refactorBlobViewerEnabled && this.isBlob) {
+      if (this.isBlob) {
         return blobRouteConfig;
       }
 
@@ -158,7 +154,7 @@ export default {
       return this.type === 'commit';
     },
     linkComponent() {
-      return this.isFolder || (this.refactorBlobViewerEnabled && this.isBlob) ? 'router-link' : 'a';
+      return this.isFolder || this.isBlob ? 'router-link' : 'a';
     },
     fullPath() {
       return this.path.replace(new RegExp(`^${escapeRegExp(this.currentPath)}/`), '');
@@ -187,10 +183,6 @@ export default {
       });
     },
     loadBlob() {
-      if (!this.refactorBlobViewerEnabled) {
-        return;
-      }
-
       this.apolloQuery(blobInfoQuery, {
         projectPath: this.projectPath,
         filePath: this.path,
diff --git a/app/assets/javascripts/repository/constants.js b/app/assets/javascripts/repository/constants.js
index 2cafeed2ef4..0e80f306638 100644
--- a/app/assets/javascripts/repository/constants.js
+++ b/app/assets/javascripts/repository/constants.js
@@ -93,7 +93,6 @@ export const LFS_STORAGE = 'lfs';
  * These are file types that we want the legacy (backend) syntax highlighter to highlight.
  */
 export const LEGACY_FILE_TYPES = [
-  'package_json',
   'gemfile',
   'gemspec',
   'composer_json',
diff --git a/app/assets/javascripts/repository/graphql.js b/app/assets/javascripts/repository/graphql.js
index 29aabe1b00f..3a59a02af01 100644
--- a/app/assets/javascripts/repository/graphql.js
+++ b/app/assets/javascripts/repository/graphql.js
@@ -9,7 +9,7 @@ Vue.use(VueApollo);
 const defaultClient = createDefaultClient(
   {
     Query: {
-      commit(_, { path, fileName, type, maxOffset }) {
+      commit(_, { path, fileName, maxOffset }) {
         return new Promise((resolve) => {
           fetchLogsTree(
             defaultClient,
@@ -19,7 +19,6 @@ const defaultClient = createDefaultClient(
               resolve,
               entry: {
                 name: fileName,
-                type,
               },
             },
             maxOffset,
diff --git a/app/assets/javascripts/repository/index.js b/app/assets/javascripts/repository/index.js
index 8f8735a6371..1d295e18332 100644
--- a/app/assets/javascripts/repository/index.js
+++ b/app/assets/javascripts/repository/index.js
@@ -91,9 +91,7 @@ export default function setupVueRepositoryList() {
 
   initLastCommitApp();
 
-  if (gon.features.refactorBlobViewer) {
-    initBlobControlsApp();
-  }
+  initBlobControlsApp();
 
   router.afterEach(({ params: { path } }) => {
     setTitle(path, ref, fullName);
diff --git a/app/assets/javascripts/repository/log_tree.js b/app/assets/javascripts/repository/log_tree.js
index ac02392d60f..9345a8406e3 100644
--- a/app/assets/javascripts/repository/log_tree.js
+++ b/app/assets/javascripts/repository/log_tree.js
@@ -16,9 +16,7 @@ function setNextOffset(offset) {
 }
 
 export function resolveCommit(commits, path, { resolve, entry }) {
-  const commit = commits.find(
-    (c) => c.filePath === `${path}/${entry.name}` && c.type === entry.type,
-  );
+  const commit = commits.find((c) => c.filePath === `${path}/${entry.name}`);
 
   if (commit) {
     resolve(commit);
diff --git a/app/assets/javascripts/repository/queries/commit.fragment.graphql b/app/assets/javascripts/repository/queries/commit.fragment.graphql
index b046fc1f730..80dedfe3e3f 100644
--- a/app/assets/javascripts/repository/queries/commit.fragment.graphql
+++ b/app/assets/javascripts/repository/queries/commit.fragment.graphql
@@ -6,5 +6,4 @@ fragment TreeEntryCommit on LogTreeCommit {
   commitPath
   fileName
   filePath
-  type
 }
diff --git a/app/assets/javascripts/repository/queries/commit.query.graphql b/app/assets/javascripts/repository/queries/commit.query.graphql
index 7ae4a3b984a..1a01462bd19 100644
--- a/app/assets/javascripts/repository/queries/commit.query.graphql
+++ b/app/assets/javascripts/repository/queries/commit.query.graphql
@@ -1,7 +1,7 @@
 #import "ee_else_ce/repository/queries/commit.fragment.graphql"
 
-query getCommit($fileName: String!, $type: String!, $path: String!, $maxOffset: Number!) {
-  commit(path: $path, fileName: $fileName, type: $type, maxOffset: $maxOffset) @client {
+query getCommit($fileName: String!, $path: String!, $maxOffset: Number!) {
+  commit(path: $path, fileName: $fileName, maxOffset: $maxOffset) @client {
     ...TreeEntryCommit
   }
 }
diff --git a/app/assets/javascripts/repository/utils/commit.js b/app/assets/javascripts/repository/utils/commit.js
index a67252ec004..878b4fdd71a 100644
--- a/app/assets/javascripts/repository/utils/commit.js
+++ b/app/assets/javascripts/repository/utils/commit.js
@@ -7,7 +7,6 @@ export function normalizeData(data, path, extra = () => {}) {
     commitPath: d.commit_path,
     fileName: d.file_name,
     filePath: `${path}/${d.file_name}`,
-    type: d.type,
     __typename: 'LogTreeCommit',
     ...extra(d),
   }));