From cf50fb05281ddf649c85556694926500087879fc Mon Sep 17 00:00:00 2001
From: Angelina Filippova <linakirsanova@gmail.com>
Date: Fri, 24 May 2019 13:34:07 +0200
Subject: [PATCH] Do not render content and statuses rows if there is no data

---
 src/store/modules/reports.js                  | 20 +-------
 src/views/reports/components/TimelineItem.vue | 46 ++++---------------
 2 files changed, 11 insertions(+), 55 deletions(-)

diff --git a/src/store/modules/reports.js b/src/store/modules/reports.js
index b4c9548f..c1f523fc 100644
--- a/src/store/modules/reports.js
+++ b/src/store/modules/reports.js
@@ -15,9 +15,6 @@ const reports = {
     SET_LOADING: (state, status) => {
       state.loading = status
     },
-    SET_REPORT: (state, { reportIndex, data }) => {
-      state.fetchedReports[reportIndex] = data
-    },
     SET_REPORTS: (state, reports) => {
       state.fetchedReports = reports
     },
@@ -28,8 +25,8 @@ const reports = {
   actions: {
     async ChangeReportState({ commit, getters, state }, { reportState, reportId }) {
       const { data } = await changeState(reportState, reportId, getters.authHost, getters.token)
-      const reportIndex = state.fetchedReports.findIndex(report => report.id === reportId)
-      commit('SET_REPORT', { reportIndex, data })
+      const updatedReports = state.fetchedReports.map(report => report.id === reportId ? data : report)
+      commit('SET_REPORTS', updatedReports)
     },
     async FetchReports({ commit, getters, state }) {
       commit('SET_LOADING', true)
@@ -60,19 +57,6 @@ const reports = {
         commit('SET_LOADING', false)
       }
     }
-    // async AddNote({ commit, state, getters }, { reportId, note }) {
-    //   const report = state.fetchedReports.find(report => report.id === reportId)
-    //   report.notes = [...report.notes, note]
-    //   const reportIndex = state.fetchedReports.findIndex(report => report.id === reportId)
-    //   commit('SET_REPORT', { reportIndex, report })
-    // },
-    // async DeleteNote({ commit, state }, { reportId, noteId }) {
-    //   const response = deleteNote(reportId, noteId)
-    //   const report = state.fetchedReports.find(report => report.id === reportId)
-    //   report.notes = response
-    //   const reportIndex = state.fetchedReports.findIndex(report => report.id === reportId)
-    //   commit('SET_REPORT', { reportIndex, report })
-    // }
   }
 }
 
diff --git a/src/views/reports/components/TimelineItem.vue b/src/views/reports/components/TimelineItem.vue
index 3a45a9d2..1e4b531a 100644
--- a/src/views/reports/components/TimelineItem.vue
+++ b/src/views/reports/components/TimelineItem.vue
@@ -4,21 +4,20 @@
       <div class="header-container">
         <h3 class="report-title">Report on {{ report.account.display_name }}</h3>
         <div>
-          <el-tag :type="getStateType(report.state)" :key="report.state" size="large">{{ capitalizeFirstLetter(report.state) }}</el-tag>
+          <el-tag :type="getStateType(report.state)" size="large">{{ capitalizeFirstLetter(report.state) }}</el-tag>
           <el-dropdown>
             <el-button plain size="small" icon="el-icon-edit">{{ $t('reports.changeState') }}<i class="el-icon-arrow-down el-icon--right"/></el-button>
             <el-dropdown-menu slot="dropdown">
               <el-dropdown-item v-if="report.state !== 'resolved'" @click.native="changeReportState('resolved', report.id)">Resolve</el-dropdown-item>
-              <el-dropdown-item v-if="report.state !== 'open'" @click.native="changeReportState('open', report.id)">Open</el-dropdown-item>
+              <el-dropdown-item v-if="report.state !== 'open'" @click.native="changeReportState('open', report.id)">Reopen</el-dropdown-item>
               <el-dropdown-item v-if="report.state !== 'closed'" @click.native="changeReportState('closed', report.id)">Close</el-dropdown-item>
             </el-dropdown-menu>
           </el-dropdown>
-          <!-- <el-button plain size="small" @click="toggleNoteInput">{{ $t('reports.reply') }}</el-button> -->
         </div>
       </div>
       <h5 class="id">ID: {{ report.id }}</h5>
-      <div class="line"/>
       <div>
+        <div class="line"/>
         <span class="report-row-key">Account:</span>
         <img
           :src="report.account.avatar"
@@ -28,14 +27,14 @@
           <span class="report-row-value">{{ report.account.acct }}</span>
         </a>
       </div>
-      <div class="line"/>
-      <div>
+      <div v-if="report.content.length > 0">
+        <div class="line"/>
         <span class="report-row-key">Content:
-          <span class="report-row-value">{{ report.content.length > 0 ? report.content : '-' }}</span>
+          <span class="report-row-value">{{ report.content }}</span>
         </span>
       </div>
-      <div class="line"/>
       <div>
+        <div class="line"/>
         <span class="report-row-key">Actor:</span>
         <img
           :src="report.actor.avatar"
@@ -45,7 +44,7 @@
           <span class="report-row-value">{{ report.actor.acct }}</span>
         </a>
       </div>
-      <div class="statuses">
+      <div v-if="report.statuses.length > 0" class="statuses">
         <el-collapse>
           <el-collapse-item :title="getStatusesTitle(report.statuses)">
             <el-card v-for="status in report.statuses" :key="status.id" class="status-card">
@@ -68,33 +67,6 @@
           </el-collapse-item>
         </el-collapse>
       </div>
-      <!-- <el-collapse v-model="showNotes">
-        <el-collapse-item :title="$t('reports.showNotes')" name="showNotes">
-          <div v-if="report.statuses.length > 0">
-            <div v-for="note in report.statuses" :key="note.id">
-              <el-card :body-style="{ padding: '6px 14px 0 14px' }" class="note">
-                <div class="header-container">
-                  <h4>{{ $t('reports.from') }} {{ note.author }}</h4>
-                  <i class="el-icon-close" @click="deleteNote(report.id, note.id)"/>
-                </div>
-                <p class="timestamp">{{ note.timestamp }}</p>
-                <p>{{ note.text }}</p>
-              </el-card>
-            </div>
-          </div>
-          <div v-else>
-            <p class="no-notes">{{ $t('reports.noNotes') }}</p>
-          </div>
-        </el-collapse-item>
-        <div v-show="showNewNoteInput" class="new-note">
-          <div class="header-container">
-            <p>{{ $t('reports.newNote') }}</p>
-            <i class="el-icon-close" @click="toggleNoteInput"/>
-          </div>
-          <el-input v-model="note" :rows="2" type="textarea" autofocus/>
-          <el-button class="submit-button" plain size="small" @click="addNewNote(report.id)">{{ $t('reports.submit') }}</el-button>
-        </div>
-      </el-collapse> -->
     </el-card>
   </el-timeline-item>
 </template>
@@ -162,7 +134,7 @@ export default {
         case 'resolved':
           return 'success'
         default:
-          return ''
+          return 'primary'
       }
     },
     getStatusesTitle(statuses) {