From f5afdf243563804e85a5d8d73b1b5338ca135400 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=A4fer?= <git@roschaefer.de>
Date: Wed, 17 Apr 2019 01:04:47 +0200
Subject: [PATCH] Merge Notification with NotificationPostCard

cc @mattwr18 Please don't see this as a revert of your work. Your
structure of the `notification-post-card` component was helpful and showed
the redundancy with `hc-post-card`. I reused a lot of the code, but
because I merged both components it now *looks* as if I authored all the code.
---
 .../Notification/NotificationPostCard.vue     | 81 -------------------
 .../notifications/Notification/index.vue      | 52 +++++++++---
 .../notifications/Notification/spec.js        |  5 ++
 .../notifications/NotificationList/spec.js    |  2 +-
 webapp/locales/de.json                        |  5 ++
 webapp/locales/en.json                        |  5 ++
 6 files changed, 57 insertions(+), 93 deletions(-)
 delete mode 100644 webapp/components/notifications/Notification/NotificationPostCard.vue

diff --git a/webapp/components/notifications/Notification/NotificationPostCard.vue b/webapp/components/notifications/Notification/NotificationPostCard.vue
deleted file mode 100644
index 108882cbb..000000000
--- a/webapp/components/notifications/Notification/NotificationPostCard.vue
+++ /dev/null
@@ -1,81 +0,0 @@
-<template>
-  <ds-card
-    :header="post.title"
-    :image="post.image"
-    :class="{'post-card': true, 'disabled-content': post.disabled}"
-    hover
-    space="x-small"
-  >
-    <nuxt-link
-      class="post-link"
-      :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
-    >
-      {{ post.title }}
-    </nuxt-link>
-    <ds-space margin-bottom="x-small" />
-    <no-ssr>
-      <hc-user
-        :user="post.author"
-        :trunc="35"
-      />
-    </no-ssr>
-    <ds-space margin-bottom="x-small" />
-    <!-- eslint-disable vue/no-v-html -->
-    <!-- TODO: replace editor content with tiptap render view -->
-    <div
-      class="hc-editor-content"
-      v-html="excerpt"
-    />
-    <!-- eslint-enable vue/no-v-html -->
-  </ds-card>
-</template>
-
-<script>
-import HcUser from '~/components/User'
-
-export default {
-  name: 'HcPostCard',
-  components: {
-    HcUser
-  },
-  props: {
-    post: {
-      type: Object,
-      required: true
-    }
-  },
-  computed: {
-    excerpt() {
-      const { contentExcerpt } = this.post
-      if (!contentExcerpt) return ''
-      // remove all links from excerpt to prevent issues with the sorrounding link
-      let excerpt = contentExcerpt.replace(/<a.*>(.+)<\/a>/gim, '$1')
-      // do not display content that is only linebreaks
-      if (excerpt.replace(/<br>/gim, '').trim() === '') {
-        excerpt = ''
-      }
-
-      return excerpt
-    }
-  }
-}
-</script>
-
-<style lang="scss">
-.post-card {
-  cursor: pointer;
-  position: relative;
-  z-index: 1;
-
-  .post-link {
-    margin: 15px;
-    display: block;
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    text-indent: -999999px;
-  }
-}
-</style>
diff --git a/webapp/components/notifications/Notification/index.vue b/webapp/components/notifications/Notification/index.vue
index ecf696d75..55b889876 100644
--- a/webapp/components/notifications/Notification/index.vue
+++ b/webapp/components/notifications/Notification/index.vue
@@ -1,21 +1,48 @@
 <template>
-  <nuxt-link
-    :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
-    @click.native="$emit('read')"
-  >
-    <ds-space margin-bottom="x-small">
-      <hc-notification-post-card :post="post" />
-    </ds-space>
-  </nuxt-link>
+  <ds-space margin-bottom="x-small">
+    <no-ssr>
+      <ds-space margin-bottom="x-small">
+      <hc-user
+        :user="post.author"
+        :trunc="35"
+      />
+      </ds-space>
+      <ds-text color="soft">
+        {{ $t("notifications.menu.mentioned") }}
+      </ds-text>
+    </no-ssr>
+    <ds-space margin-bottom="x-small" />
+    <nuxt-link
+      class="notification-mention-post"
+      :to="{ name: 'post-id-slug', params: { id: post.id, slug: post.slug } }"
+      @click.native="$emit('read')"
+    >
+      <ds-space margin-bottom="x-small">
+        <ds-card
+          :header="post.title"
+          :image="post.image"
+          :class="{'post-card': true, 'disabled-content': post.disabled}"
+          hover
+          space="x-small"
+        >
+          <ds-space margin-bottom="x-small" />
+          <!-- eslint-disable vue/no-v-html -->
+          <div v-html="excerpt" />
+        <!-- eslint-enable vue/no-v-html -->
+        </ds-card>
+      </ds-space>
+    </nuxt-link>
+  </ds-space>
 </template>
 
 <script>
-import HcNotificationPostCard from './NotificationPostCard.vue'
+import HcUser from '~/components/User'
+import RemoveLinks from '~/mixins/removeLinks'
 
 export default {
   name: 'Notification',
   components: {
-    HcNotificationPostCard
+    HcUser
   },
   props: {
     notification: {
@@ -24,8 +51,11 @@ export default {
     }
   },
   computed: {
+    excerpt() {
+      return RemoveLinks.methods.removeLinks(this.post.contentExcerpt)
+    },
     post() {
-      return this.notification.post
+      return this.notification.post || {}
     }
   }
 }
diff --git a/webapp/components/notifications/Notification/spec.js b/webapp/components/notifications/Notification/spec.js
index a39cb5940..c65f0ba3c 100644
--- a/webapp/components/notifications/Notification/spec.js
+++ b/webapp/components/notifications/Notification/spec.js
@@ -11,9 +11,13 @@ config.stubs['no-ssr'] = '<span><slot /></span>'
 describe('Notification', () => {
   let wrapper
   let stubs
+  let mocks
   let propsData
   beforeEach(() => {
     propsData = {}
+    mocks = {
+      $t: jest.fn()
+    }
     stubs = {
       NuxtLink: RouterLinkStub
     }
@@ -22,6 +26,7 @@ describe('Notification', () => {
   const Wrapper = () => {
     return mount(Notification, {
       stubs,
+      mocks,
       propsData,
       localVue
     })
diff --git a/webapp/components/notifications/NotificationList/spec.js b/webapp/components/notifications/NotificationList/spec.js
index 49e7262df..a4c129620 100644
--- a/webapp/components/notifications/NotificationList/spec.js
+++ b/webapp/components/notifications/NotificationList/spec.js
@@ -114,7 +114,7 @@ describe('NotificationList.vue', () => {
     describe('click on a notification', () => {
       beforeEach(() => {
         wrapper
-          .findAll(Notification)
+          .findAll('.notification-mention-post')
           .at(1)
           .trigger('click')
       })
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 94ca1ac1b..04a14f2a7 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -18,6 +18,11 @@
     "commented": "Kommentiert",
     "socialMedia": "Wo sonst finde ich"
   },
+  "notifications": {
+    "menu": {
+       "mentioned": "hat dich in einem Beitrag erwähnt"
+    }
+  },
   "search": {
     "placeholder": "Suchen",
     "hint": "Wonach suchst du?",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 40cc766d0..b0f06952b 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -18,6 +18,11 @@
     "commented": "Commented",
     "socialMedia": "Where else can I find"
   },
+  "notifications": {
+    "menu": {
+      "mentioned": "has mentioned you in a post"
+    }
+  },
   "search": {
     "placeholder": "Search",
     "hint": "What are you searching for?",