From c470ac31db8c939d68ed8b0ee465084ba61de1f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timoth=C3=A9e=20Poussard?= <tpoussard@neogeo.fr>
Date: Tue, 23 May 2023 17:18:41 +0200
Subject: [PATCH] fix no link toproject & disable comment if deleted

---
 src/components/Account/UserActivity.vue | 76 ++++++++++++++++---------
 1 file changed, 50 insertions(+), 26 deletions(-)

diff --git a/src/components/Account/UserActivity.vue b/src/components/Account/UserActivity.vue
index ffdc60a0..f6e8b18a 100644
--- a/src/components/Account/UserActivity.vue
+++ b/src/components/Account/UserActivity.vue
@@ -19,26 +19,43 @@
               <div :class="['content', { 'ellipsis nowrap': item.related_feature.title }]">
                 {{ getNotificationName(item.event_type, item.object_type) }}
 
-                <router-link
-                  v-if="item.related_feature.title"
-                  :to="{
-                    name: 'details-signalement',
-                    params: {
-                      slug: item.project_slug,
-                      slug_type_signal: item.feature_type_slug,
-                      slug_signal: item.feature_id,
-                    }
-                  }"
+                <div 
+                  v-if="item.object_type === 'project'"
                 >
-                {{ item.related_feature.title }}
-                </router-link>
+                  <router-link
+                    v-if="item.project_title"
+                    :to="{
+                      name: 'project_detail',
+                      params: { slug: item.project_slug },
+                    }"
+                  >
+                    {{ item.project_title }}
+                  </router-link>
+                  <span
+                    v-else
+                    class="meta"
+                  ><del>{{ item.project_slug }}</del>&nbsp;(supprimé)</span>
+                </div>
 
-                <span
-                  v-else-if="item.object_type !== 'project'"
-                  class="meta"
-                >
-                  <del>{{ item.data.feature_title }}</del>&nbsp;(supprimé)
-                </span>
+                <div v-else>
+                  <router-link
+                    v-if="item.related_feature.deletion_on === 'None'"
+                    :to="{
+                      name: 'details-signalement',
+                      params: {
+                        slug: item.project_slug,
+                        slug_type_signal: item.feature_type_slug,
+                        slug_signal: item.feature_id,
+                      }
+                    }"
+                  >
+                    {{ item.related_feature.title }}
+                  </router-link>
+                  <span
+                    v-else
+                    class="meta"
+                  ><del>{{ item.data.feature_title || item.feature_id }}</del>&nbsp;(supprimé)</span>
+                </div>
 
                 <div class="description">
                   <em>[ {{ item.created_on }}
@@ -49,7 +66,7 @@
                 </div>
               </div>
             </div>
-            
+
             <em
               v-if="!events || events.length === 0"
             >Aucune notification pour le moment.</em>
@@ -74,7 +91,7 @@
               <div class="content">
                 <div>
                   <router-link
-                    v-if="item.related_feature && item.related_feature.feature_url"
+                    v-if="item.related_feature.deletion_on === 'None'"
                     :to="{
                       name: 'details-signalement',
                       params: {
@@ -91,7 +108,7 @@
                     v-else
                     class="meta"
                   >
-                    <del>{{ item.data.feature_title }}</del>&nbsp;(supprimé)
+                    <del>{{ item.data.feature_title || item.feature_id }}</del>&nbsp;(supprimé)
                   </span>
                 </div>
 
@@ -125,12 +142,10 @@
               :key="item.id"
               class="item"
             >
-              <div
-                v-if="item.related_feature && item.related_feature.feature_url"
-                class="content"
-              >
+              <div class="content">
                 <div>
                   <router-link
+                    v-if="item.related_feature.deletion_on === 'None'"
                     :to="{
                       name: 'details-signalement',
                       params: {
@@ -140,9 +155,17 @@
                       }
                     }"
                   >
-                    "{{ item.related_comment.comment }}"
+                    "{{ item.data.comment }}"
                   </router-link>
+
+                  <span
+                    v-else
+                    class="meta"
+                  >
+                    <del>{{ item.data.comment }}</del>&nbsp;(supprimé)
+                  </span>
                 </div>
+
                 <div class="description">
                   <em>[ {{ item.created_on }}
                     <span v-if="user">
@@ -152,6 +175,7 @@
                 </div>
               </div>
             </div>
+
             <em
               v-if="!comments || comments.length === 0"
             >Aucun commentaire pour le moment.</em>
-- 
GitLab