Merge branch '48960-namespace-diff-module' into 'master'

Resolve "Use namespaped module for diffs"

Closes #48960

See merge request gitlab-org/gitlab-ce!20442

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

@@ -63,7 +63,8 @@ export default {
       plainDiffPath: state => state.diffs.plainDiffPath,
       emailPatchPath: state => state.diffs.emailPatchPath,
     }),
-    ...mapGetters(['isParallelView', 'isNotesFetched']),
+    ...mapGetters('diffs', ['isParallelView']),
+    ...mapGetters(['isNotesFetched']),
     targetBranch() {
       return {
         branchName: this.targetBranchName,
@@ -115,7 +116,7 @@ export default {
     this.adjustView();
   },
   methods: {
-    ...mapActions(['setBaseConfig', 'fetchDiffFiles']),
+    ...mapActions('diffs', ['setBaseConfig', 'fetchDiffFiles']),
     fetchData() {
       this.fetchDiffFiles().catch(() => {
         createFlash(__('Something went wrong on our end. Please try again!'));

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

@@ -31,7 +31,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['isInlineView', 'isParallelView', 'areAllFilesCollapsed']),
+    ...mapGetters('diffs', ['isInlineView', 'isParallelView', 'areAllFilesCollapsed']),
     sumAddedLines() {
       return this.sumValues('addedLines');
     },
@@ -66,7 +66,7 @@ export default {
     document.removeEventListener('scroll', this.handleScroll);
   },
   methods: {
-    ...mapActions(['setInlineDiffViewType', 'setParallelDiffViewType', 'expandAllFiles']),
+    ...mapActions('diffs', ['setInlineDiffViewType', 'setParallelDiffViewType', 'expandAllFiles']),
     pluralize,
     handleScroll() {
       if (!this.updating) {

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

@@ -22,7 +22,7 @@ export default {
       projectPath: state => state.diffs.projectPath,
       endpoint: state => state.diffs.endpoint,
     }),
-    ...mapGetters(['isInlineView', 'isParallelView']),
+    ...mapGetters('diffs', ['isInlineView', 'isParallelView']),
     diffMode() {
       const diffModeKey = Object.keys(diffModes).find(key => this.diffFile[`${key}File`]);
       return diffModes[diffModeKey] || diffModes.replaced;

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

@@ -58,7 +58,7 @@ export default {
     document.removeEventListener('scroll', this.handleScroll);
   },
   methods: {
-    ...mapActions(['loadCollapsedDiff']),
+    ...mapActions('diffs', ['loadCollapsedDiff']),
     handleToggle() {
       const { collapsed, highlightedDiffLines, parallelDiffLines } = this.file;
 

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

@@ -108,7 +108,7 @@ export default {
     },
   },
   methods: {
-    ...mapActions(['loadMoreLines', 'showCommentForm']),
+    ...mapActions('diffs', ['loadMoreLines', 'showCommentForm']),
     handleCommentButton() {
       this.showCommentForm({ lineCode: this.lineCode });
     },

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

@@ -59,7 +59,8 @@ export default {
     }
   },
   methods: {
-    ...mapActions(['cancelCommentForm', 'saveNote', 'refetchDiscussionById']),
+    ...mapActions('diffs', ['cancelCommentForm']),
+    ...mapActions(['saveNote', 'refetchDiscussionById']),
     handleCancelCommentForm() {
       this.autosave.reset();
       this.cancelCommentForm({

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

@@ -36,7 +36,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['isInlineView']),
+    ...mapGetters('diffs', ['isInlineView']),
     isContextLine() {
       return this.line.type === CONTEXT_LINE_TYPE;
     },

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

@@ -20,7 +20,8 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(['commitId', 'discussionsByLineCode']),
+    ...mapGetters('diffs', ['commitId']),
+    ...mapGetters(['discussionsByLineCode']),
     ...mapState({
       diffLineCommentForms: state => state.diffs.diffLineCommentForms,
     }),

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

@@ -40,7 +40,7 @@ export default {
     };
   },
   computed: {
-    ...mapGetters(['isParallelView']),
+    ...mapGetters('diffs', ['isParallelView']),
     isContextLine() {
       return this.line.left.type === CONTEXT_LINE_TYPE;
     },

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

@@ -21,7 +21,8 @@ export default {
     },
   },
   computed: {
-    ...mapGetters(['commitId', 'discussionsByLineCode']),
+    ...mapGetters('diffs', ['commitId']),
+    ...mapGetters(['discussionsByLineCode']),
     ...mapState({
       diffLineCommentForms: state => state.diffs.diffLineCommentForms,
     }),

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

@@ -4,6 +4,7 @@ import mutations from '../mutations';
 import createState from './diff_state';
 
 export default {
+  namespaced: true,
   state: createState(),
   getters,
   actions,

spec/javascripts/diffs/components/inline_diff_view_spec.js

@@ -13,7 +13,7 @@ describe('InlineDiffView', () => {
   beforeEach(() => {
     const diffFile = getDiffFileMock();
 
-    store.dispatch('setInlineDiffViewType');
+    store.dispatch('diffs/setInlineDiffViewType');
     component = createComponentWithStore(Vue.extend(InlineDiffView), store, {
       diffFile,
       diffLines: diffFile.highlightedDiffLines,