1 files changed, 7 insertions, 39 deletions

diff --git a/app/assets/javascripts/diffs/mixins/diff_content.js b/app/assets/javascripts/diffs/mixins/diff_content.js
index bef06ad2b52..ebb511d3a7e 100644
--- a/app/assets/javascripts/diffs/mixins/diff_content.js
+++ b/app/assets/javascripts/diffs/mixins/diff_content.js
@@ -1,9 +1,9 @@
-import { mapState, mapGetters, mapActions } from 'vuex';
+import { mapGetters } from 'vuex';
 import diffDiscussions from '../components/diff_discussions.vue';
 import diffLineGutterContent from '../components/diff_line_gutter_content.vue';
 import diffLineNoteForm from '../components/diff_line_note_form.vue';
+import diffTableRow from '../components/diff_table_row.vue';
 import { trimFirstCharOfLineContent } from '../store/utils';
-import { CONTEXT_LINE_TYPE, CONTEXT_LINE_CLASS_NAME } from '../constants';
 
 export default {
   props: {
@@ -16,22 +16,14 @@ export default {
       required: true,
     },
   },
-  data() {
-    return {
-      hoveredLineCode: null,
-      hoveredSection: null,
-    };
-  },
   components: {
     diffDiscussions,
+    diffTableRow,
     diffLineNoteForm,
     diffLineGutterContent,
   },
   computed: {
-    ...mapState({
-      diffLineCommentForms: state => state.diffs.diffLineCommentForms,
-    }),
-    ...mapGetters(['discussionsByLineCode', 'isLoggedIn', 'commit']),
+    ...mapGetters(['commit']),
     commitId() {
       return this.commit && this.commit.id;
     },
@@ -41,15 +33,15 @@ export default {
     normalizedDiffLines() {
       return this.diffLines.map(line => {
         if (line.richText) {
-          return this.trimFirstChar(line);
+          return trimFirstCharOfLineContent(line);
         }
 
         if (line.left) {
-          Object.assign(line, { left: this.trimFirstChar(line.left) });
+          Object.assign(line, { left: trimFirstCharOfLineContent(line.left) });
         }
 
         if (line.right) {
-          Object.assign(line, { right: this.trimFirstChar(line.right) });
+          Object.assign(line, { right: trimFirstCharOfLineContent(line.right) });
         }
 
         return line;
@@ -62,28 +54,4 @@ export default {
       return this.diffFile.fileHash;
     },
   },
-  methods: {
-    ...mapActions(['showCommentForm', 'cancelCommentForm']),
-    getRowClass(line) {
-      const isContextLine = line.left
-        ? line.left.type === CONTEXT_LINE_TYPE
-        : line.type === CONTEXT_LINE_TYPE;
-
-      return {
-        [line.type]: line.type,
-        [CONTEXT_LINE_CLASS_NAME]: isContextLine,
-      };
-    },
-    trimFirstChar(line) {
-      return trimFirstCharOfLineContent(line);
-    },
-    handleShowCommentForm(params) {
-      this.showCommentForm({ lineCode: params.lineCode });
-    },
-    isDiscussionExpanded(lineCode) {
-      const discussions = this.discussionsByLineCode[lineCode];
-
-      return discussions ? discussions.every(discussion => discussion.expanded) : false;
-    },
-  },
 };