Merge branch 'ph/fixLogsNotShowing' into 'master'

Fixes the file row not showing commits for certain projects

See merge request gitlab-org/gitlab!30647

ee/app/assets/javascripts/repository/utils/commit.js

@@ -3,6 +3,6 @@ import { normalizeData as normalizeDataFOSS } from '~/repository/utils/commit';
 // eslint-disable-next-line import/prefer-default-export
 export function normalizeData(data, path) {
   return normalizeDataFOSS(data, path, d => ({
-    lockLabel: d.lock_label,
+    lockLabel: d.lock_label || false,
   }));
 }

ee/changelogs/unreleased/ph-fixLogsNotShowing.yml

+---
+title: Fixes file row commits not showing for certain projects
+merge_request:
+author:
+type: fixed

ee/spec/frontend/repository/utils/commit_spec.js

@@ -30,4 +30,23 @@ describe('normalizeData', () => {
       },
     ]);
   });
+
+  it('normalizes data into LogTreeCommit object with no lockLabel', () => {
+    const mock = [...mockData];
+    delete mock[0].lock_label;
+
+    expect(normalizeData(mock, '')).toEqual([
+      {
+        sha: '123',
+        message: 'testing message',
+        committedDate: '2019-01-01',
+        commitPath: 'https://test.com',
+        fileName: 'index.js',
+        filePath: '/index.js',
+        type: 'blob',
+        lockLabel: false,
+        __typename: 'LogTreeCommit',
+      },
+    ]);
+  });
 });

spec/frontend/repository/log_tree_spec.js

@@ -86,16 +86,18 @@ describe('fetchLogsTree', () => {
 
   it('calls entry resolver', () =>
     fetchLogsTree(client, '', '0', resolver).then(() => {
-      expect(resolver.resolve).toHaveBeenCalledWith({
-        __typename: 'LogTreeCommit',
-        commitPath: 'https://test.com',
-        committedDate: '2019-01-01',
-        fileName: 'index.js',
-        filePath: '/index.js',
-        message: 'testing message',
-        sha: '123',
-        type: 'blob',
-      });
+      expect(resolver.resolve).toHaveBeenCalledWith(
+        expect.objectContaining({
+          __typename: 'LogTreeCommit',
+          commitPath: 'https://test.com',
+          committedDate: '2019-01-01',
+          fileName: 'index.js',
+          filePath: '/index.js',
+          message: 'testing message',
+          sha: '123',
+          type: 'blob',
+        }),
+      );
     }));
 
   it('writes query to client', () =>
@@ -104,7 +106,7 @@ describe('fetchLogsTree', () => {
         query: expect.anything(),
         data: {
           commits: [
-            {
+            expect.objectContaining({
               __typename: 'LogTreeCommit',
               commitPath: 'https://test.com',
               committedDate: '2019-01-01',
@@ -113,7 +115,7 @@ describe('fetchLogsTree', () => {
               message: 'testing message',
               sha: '123',
               type: 'blob',
-            },
+            }),
           ],
         },
       });