Merge branch 'ph/vueFileListLockLabelFoss' into 'master'

Only load lock labels in EE

See merge request gitlab-org/gitlab!20143

app/assets/javascripts/repository/log_tree.js

 import axios from '~/lib/utils/axios_utils';
+import { normalizeData } from 'ee_else_ce/repository/utils/commit';
 import getCommits from './queries/getCommits.query.graphql';
 import getProjectPath from './queries/getProjectPath.query.graphql';
 import getRef from './queries/getRef.query.graphql';
@@ -6,19 +7,6 @@ import getRef from './queries/getRef.query.graphql';
 let fetchpromise;
 let resolvers = [];
 
-export function normalizeData(data) {
-  return data.map(d => ({
-    sha: d.commit.id,
-    message: d.commit.message,
-    committedDate: d.commit.committed_date,
-    commitPath: d.commit_path,
-    fileName: d.file_name,
-    type: d.type,
-    lockLabel: d.lock_label,
-    __typename: 'LogTreeCommit',
-  }));
-}
-
 export function resolveCommit(commits, { resolve, entry }) {
   const commit = commits.find(c => c.fileName === entry.name && c.type === entry.type);
 

app/assets/javascripts/repository/queries/commit.fragment.graphql

+fragment TreeEntryCommit on LogTreeCommit {
+  sha
+  message
+  committedDate
+  commitPath
+  fileName
+  type
+}

app/assets/javascripts/repository/queries/getCommit.query.graphql

+#import "ee_else_ce/repository/queries/commit.fragment.graphql"
+
 query getCommit($fileName: String!, $type: String!, $path: String!) {
   commit(path: $path, fileName: $fileName, type: $type) @client {
-    sha
-    message
-    committedDate
-    commitPath
-    fileName
-    type
-    lockLabel
+    ...TreeEntryCommit
   }
 }

app/assets/javascripts/repository/queries/getCommits.query.graphql

+#import "ee_else_ce/repository/queries/commit.fragment.graphql"
+
 query getCommits {
   commits @client {
-    sha
-    message
-    committedDate
-    commitPath
-    fileName
-    type
-    lockLabel
+    ...TreeEntryCommit
   }
 }

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

+// eslint-disable-next-line import/prefer-default-export
+export function normalizeData(data, extra = () => {}) {
+  return data.map(d => ({
+    sha: d.commit.id,
+    message: d.commit.message,
+    committedDate: d.commit.committed_date,
+    commitPath: d.commit_path,
+    fileName: d.file_name,
+    type: d.type,
+    __typename: 'LogTreeCommit',
+    ...extra(d),
+  }));
+}

ee/app/assets/javascripts/repository/queries/commit.fragment.graphql

+fragment TreeEntryCommit on LogTreeCommit {
+  sha
+  message
+  committedDate
+  commitPath
+  fileName
+  type
+  lockLabel
+}

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

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

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

+import { normalizeData } from 'ee/repository/utils/commit';
+
+const mockData = [
+  {
+    commit: {
+      id: '123',
+      message: 'testing message',
+      committed_date: '2019-01-01',
+    },
+    commit_path: `https://test.com`,
+    file_name: 'index.js',
+    type: 'blob',
+    lock_label: 'Locked',
+  },
+];
+
+describe('normalizeData', () => {
+  it('normalizes data into LogTreeCommit object', () => {
+    expect(normalizeData(mockData)).toEqual([
+      {
+        sha: '123',
+        message: 'testing message',
+        committedDate: '2019-01-01',
+        commitPath: 'https://test.com',
+        fileName: 'index.js',
+        type: 'blob',
+        lockLabel: 'Locked',
+        __typename: 'LogTreeCommit',
+      },
+    ]);
+  });
+});

spec/frontend/repository/log_tree_spec.js

 import MockAdapter from 'axios-mock-adapter';
 import axios from '~/lib/utils/axios_utils';
-import { normalizeData, resolveCommit, fetchLogsTree } from '~/repository/log_tree';
+import { resolveCommit, fetchLogsTree } from '~/repository/log_tree';
 
 const mockData = [
   {
@@ -15,22 +15,6 @@ const mockData = [
   },
 ];
 
-describe('normalizeData', () => {
-  it('normalizes data into LogTreeCommit object', () => {
-    expect(normalizeData(mockData)).toEqual([
-      {
-        sha: '123',
-        message: 'testing message',
-        committedDate: '2019-01-01',
-        commitPath: 'https://test.com',
-        fileName: 'index.js',
-        type: 'blob',
-        __typename: 'LogTreeCommit',
-      },
-    ]);
-  });
-});
-
 describe('resolveCommit', () => {
   it('calls resolve when commit found', () => {
     const resolver = {

spec/frontend/repository/utils/commit_spec.js

+import { normalizeData } from '~/repository/utils/commit';
+
+const mockData = [
+  {
+    commit: {
+      id: '123',
+      message: 'testing message',
+      committed_date: '2019-01-01',
+    },
+    commit_path: `https://test.com`,
+    file_name: 'index.js',
+    type: 'blob',
+  },
+];
+
+describe('normalizeData', () => {
+  it('normalizes data into LogTreeCommit object', () => {
+    expect(normalizeData(mockData)).toEqual([
+      {
+        sha: '123',
+        message: 'testing message',
+        committedDate: '2019-01-01',
+        commitPath: 'https://test.com',
+        fileName: 'index.js',
+        type: 'blob',
+        __typename: 'LogTreeCommit',
+      },
+    ]);
+  });
+});