From 73e04c91cc072572d43151a18701203155fe3cc7 Mon Sep 17 00:00:00 2001
From: Lukas Hirt <lhirt@owncloud.com>
Date: Tue, 6 Aug 2019 13:05:56 +0200
Subject: [PATCH] Fixed actions in notifications

Added reload of list
---
 src/components/Notifications.vue | 92 ++++++++++++++++++++++++--------
 1 file changed, 71 insertions(+), 21 deletions(-)

diff --git a/src/components/Notifications.vue b/src/components/Notifications.vue
index ac5b2cb6344..bb6de6ce3f5 100644
--- a/src/components/Notifications.vue
+++ b/src/components/Notifications.vue
@@ -1,23 +1,46 @@
 <template>
   <div id="oc-notification" class="uk-navbar-item">
-    <oc-icon id="oc-notification-bell" class="oc-cursor-pointer" name="bell" variation="inverted" ariaLabel="Notifications" />
-    <oc-drop id="oc-notification-drop" toggle="#oc-notification-bell" boundary="#oc-notification" class="uk-overflow-auto uk-height-large uk-width-large">
-      <div v-for="(el, index) in activeNotifications" :key="index" class="uk-width-1-1 uk-background-muted uk-padding-small uk-display-inline-block">
-        <h5 class="uk-h4">
-          {{ el.subject }}
-        </h5>
-        <p v-if="el.message" class="uk-text-small">
-          {{ el.message }}
-        </p>
+    <oc-icon
+      id="oc-notification-bell"
+      class="oc-cursor-pointer"
+      name="bell"
+      variation="inverted"
+      aria-label="Notifications"
+    />
+    <oc-drop
+      id="oc-notification-drop"
+      toggle="#oc-notification-bell"
+      boundary="#oc-notification"
+      class="uk-overflow-auto uk-height-large uk-width-large"
+    >
+      <div
+        v-for="(el, index) in activeNotifications"
+        :key="index"
+        class="uk-width-1-1"
+      >
+        <h5 class="uk-h4">{{ el.subject }}</h5>
+        <p v-if="el.message" class="uk-text-small">{{ el.message }}</p>
         <p>
           <a v-if="el.link" :href="el.link" class="uk-link" target="_blank">{{el.link}}</a>
         </p>
-        <div class="uk-button-group uk-float-right">
-          <template v-if="el.actions.length!==0" class="uk-text-small">
-            <button v-for="(action, index) in sortedActions(el.actions)" :key="index" class="uk-button uk-button-small" :class="[action.primary ? 'uk-button-primary' : 'uk-button-default']" @click.prevent="executeRequest(el.app, action.link, action.type)">{{ action.label }}</button>
+        <div class="uk-button-group uk-width-1-1 uk-flex-right">
+          <template v-if="el.actions.length !== 0">
+            <oc-button
+              v-for="(action, index) in el.actions"
+              :key="index"
+              size="small"
+              :variation="action.primary ? 'primary' : 'default'"
+              @click.prevent="executeRequest(el.app, action.link, action.type, el.notification_id)"
+            >{{ action.label }}</oc-button>
           </template>
-          <button id="resolve-notification-button" class="uk-button uk-button-default uk-button-small" @click.prevent.once="deleteNotification({ client: $client, notification: el.notification_id })">Mark as read</button>
+          <oc-button
+            v-else
+            id="resolve-notification-button"
+            size="small"
+            @click.prevent.once="deleteNotification({ client: $client, notification: el.notification_id })"
+          >Mark as read</oc-button>
         </div>
+        <hr v-if="index + 1 !== activeNotifications.length" />
       </div>
     </oc-drop>
   </div>
@@ -27,18 +50,43 @@ import { mapGetters, mapActions } from 'vuex'
 
 export default {
   computed: {
-    ...mapGetters(['activeNotifications'])
+    ...mapGetters(['activeNotifications', 'configuration'])
   },
   methods: {
-    ...mapActions(['deleteNotification']),
-    sortedActions (actions) {
-      actions.sort((x, y) => x.primary === y.primary ? 0 : x.primary ? -1 : 1)
-    },
-    executeRequest (app, link, type) {
+    ...mapActions(['deleteNotification', 'showMessage']),
+    ...mapActions('Files', ['loadFolder']),
+
+    executeRequest (app, link, type, notificationId) {
       this.$client.requests.ocs({
         service: 'apps/' + app,
-        action: link,
+        action: link.substr(link.lastIndexOf('api')),
         method: type
+      }).then(res => {
+        this.deleteNotification({
+          client: this.$client,
+          notification: notificationId
+        })
+        res.json().then(json => {
+          json.ocs.data.map(item => {
+            const path = item.path.substr(0, item.path.lastIndexOf('/') + 1)
+            const absolutePath = this.$route.params.item ? this.$route.params.item : '/'
+            if (path === absolutePath) this.reloadFilesList(path)
+          })
+        })
+      })
+    },
+    reloadFilesList (path) {
+      this.loadFolder({
+        client: this.$client,
+        absolutePath: path,
+        $gettext: this.$gettext,
+        routeName: this.$route.name
+      }).catch((error) => {
+        this.showMessage({
+          title: this.$gettext('Loading folder failed'),
+          desc: error.message,
+          status: 'danger'
+        })
       })
     }
   }
@@ -46,5 +94,7 @@ export default {
 </script>
 
 <style scoped>
-div > div > div:nth-of-type(n+2) { margin-top: 20px; }
+div > div > div:nth-of-type(n + 2) {
+  margin-top: 20px;
+}
 </style>