From 73f8e7087cb0f8d36bf75ec4c131b0c5c3779a0c Mon Sep 17 00:00:00 2001
From: GretaD <gretadoci@gmail.com>
Date: Thu, 27 Aug 2020 19:40:20 +0200
Subject: [PATCH] fixup! Add rename mailbox option

Signed-off-by: GretaD <gretadoci@gmail.com>
---
 src/components/NavigationFolder.vue  | 331 ---------------------------
 src/components/NavigationMailbox.vue |  46 +++-
 src/service/FolderService.js         |  51 -----
 src/service/MailboxService.js        |   9 +
 src/store/actions.js                 |  10 +-
 src/store/mutations.js               |  12 +-
 6 files changed, 66 insertions(+), 393 deletions(-)
 delete mode 100644 src/components/NavigationFolder.vue
 delete mode 100644 src/service/FolderService.js

diff --git a/src/components/NavigationFolder.vue b/src/components/NavigationFolder.vue
deleted file mode 100644
index 932689a5ce..0000000000
--- a/src/components/NavigationFolder.vue
+++ /dev/null
@@ -1,331 +0,0 @@
-<!--
-  - @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
-  -
-  - @author 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
-  -
-  - @license GNU AGPL version 3 or any later version
-  -
-  - This program is free software: you can redistribute it and/or modify
-  - it under the terms of the GNU Affero General Public License as
-  - published by the Free Software Foundation, either version 3 of the
-  - License, or (at your option) any later version.
-  -
-  - This program is distributed in the hope that it will be useful,
-  - but WITHOUT ANY WARRANTY; without even the implied warranty of
-  - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  - GNU Affero General Public License for more details.
-  -
-  - You should have received a copy of the GNU Affero General Public License
-  - along with this program.  If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<template>
-	<AppNavigationItem
-		v-if="visible"
-		:id="genId(folder)"
-		:key="genId(folder)"
-		:allow-collapse="true"
-		:force-menu="true"
-		:icon="icon"
-		:title="title"
-		:to="to"
-		@update:menuOpen="onMenuToggle"
-	>
-		<!-- actions -->
-		<template slot="actions">
-			<template v-if="top">
-				<ActionText
-					v-if="!account.isUnified && folder.specialRole !== 'flagged'"
-					icon="icon-info"
-					:title="folderId"
-				>
-					{{ statsText }}
-				</ActionText>
-				<ActionButton
-					v-if="renameLabel && folder.specialRole === null"
-					icon="icon-rename"
-					@click.prevent.stop="openRenameInput"
-				>
-					{{ t('mail', 'Edit name') }}
-				</ActionButton>
-				<ActionInput
-					v-if="renameInput"
-					icon="icon-rename"
-					:value.sync="folder.displayName"
-					@submit.prevent.stop="renameFolder"
-				/>
-				<ActionText v-if="showSaving" icon="icon-loading-small">
-					{{ t('mail', 'Saving') }}
-				</ActionText>
-				<ActionButton
-					v-if="folder.specialRole !== 'flagged'"
-					icon="icon-mail"
-					:title="t('mail', 'Mark all as read')"
-					:disabled="loadingMarkAsRead"
-					@click="markAsRead"
-				>
-					{{ t('mail', 'Mark all messages of this folder as read') }}
-				</ActionButton>
-
-				<ActionInput
-					v-if="!account.isUnified && folder.specialRole !== 'flagged'"
-					icon="icon-add"
-					@submit="createFolder"
-				>
-					{{ t('mail', 'Add subfolder') }}
-				</ActionInput>
-
-				<ActionButton
-					v-if="debug && !account.isUnified && folder.specialRole !== 'flagged'"
-					icon="icon-settings"
-					:title="t('mail', 'Clear cache')"
-					:disabled="clearingCache"
-					@click="clearCache"
-				>
-					{{ t('mail', 'Clear locally cached data, in case there are issues with synchronization.') }}
-				</ActionButton>
-			</template>
-		</template>
-		<AppNavigationCounter v-if="folder.unread" slot="counter">
-			{{ folder.unread }}
-		</AppNavigationCounter>
-
-		<!-- subfolders -->
-		<NavigationFolder
-			v-for="subFolder in subFolders"
-			:key="genId(subFolder)"
-			:account="account"
-			:folder="subFolder"
-			:top="false"
-		/>
-	</AppNavigationItem>
-</template>
-
-<script>
-import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
-import AppNavigationCounter from '@nextcloud/vue/dist/Components/AppNavigationCounter'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
-import ActionInput from '@nextcloud/vue/dist/Components/ActionInput'
-import ActionText from '@nextcloud/vue/dist/Components/ActionText'
-
-import {clearCache} from '../service/MessageService'
-import {getFolderStats} from '../service/FolderService'
-import logger from '../logger'
-import {translatePlural as n} from '@nextcloud/l10n'
-import {translate as translateMailboxName} from '../i18n/MailboxTranslator'
-import {showInfo} from '@nextcloud/dialogs'
-
-export default {
-	name: 'NavigationFolder',
-	components: {
-		AppNavigationItem,
-		AppNavigationCounter,
-		ActionText,
-		ActionButton,
-		ActionInput,
-	},
-	props: {
-		account: {
-			type: Object,
-			required: true,
-		},
-		folder: {
-			type: Object,
-			required: true,
-		},
-		top: {
-			type: Boolean,
-			default: true,
-		},
-		filter: {
-			type: String,
-			default: '',
-			required: false,
-		},
-	},
-	data() {
-		return {
-			debug: window?.OC?.debug || false,
-			folderStats: undefined,
-			loadingMarkAsRead: false,
-			clearingCache: false,
-			renameLabel: true,
-			renameInput: false,
-			showSaving: false,
-		}
-	},
-	computed: {
-		visible() {
-			return (
-				this.account.showSubscribedOnly === false ||
-				(this.folder.attributes && this.folder.attributes.includes('\\subscribed'))
-			)
-		},
-		title() {
-			if (this.filter === 'starred') {
-				// Little hack to trick the translation logic into a different path
-				return translateMailboxName({
-					...this.folder,
-					specialUse: ['flagged'],
-				})
-			}
-			return translateMailboxName(this.folder)
-		},
-		folderId() {
-			return atob(this.folder.id)
-		},
-		icon() {
-			if (this.filter === 'starred') {
-				return 'icon-flagged'
-			} else if (this.folder.isPriorityInbox) {
-				return 'icon-important'
-			}
-			return this.folder.specialRole ? 'icon-' + this.folder.specialRole : 'icon-folder'
-		},
-		to() {
-			return {
-				name: 'folder',
-				params: {
-					accountId: this.account.id,
-					folderId: this.folder.id,
-					filter: this.filter ? this.filter : undefined,
-				},
-			}
-		},
-		subFolders() {
-			return this.$store.getters.getSubfolders(this.account.id, this.folder.id)
-		},
-		statsText() {
-			if (this.folderStats && 'total' in this.folderStats && 'unread' in this.folderStats) {
-				if (this.folderStats.unread === 0) {
-					return n('mail', '{total} message', '{total} messages', this.folderStats.total, {
-						total: this.folderStats.total,
-					})
-				} else {
-					return n(
-						'mail',
-						'{unread} unread of {total}',
-						'{unread} unread of {total}',
-						this.folderStats.unread,
-						{
-							total: this.folderStats.total,
-							unread: this.folderStats.unread,
-						}
-					)
-				}
-			}
-			return t('mail', 'Loading …')
-		},
-	},
-	methods: {
-		/**
-		 * Generate unique key id for a specific folder
-		 */
-		genId(folder) {
-			return 'account-' + this.account.id + '_' + folder.id
-		},
-
-		/**
-		 * On menu toggle, fetch stats
-		 * @param {boolean} open menu opened state
-		 */
-		onMenuToggle(open) {
-			if (open) {
-				this.fetchFolderStats()
-			}
-		},
-
-		/**
-		 * Fetch folder unread/read stats
-		 */
-		async fetchFolderStats() {
-			this.folderStats = null
-			if (this.account.isUnified || this.folder.specialRole === 'flagged') {
-				return
-			}
-
-			try {
-				const stats = await getFolderStats(this.account.id, this.folder.id)
-				logger.debug('loaded folder stats', {stats})
-				this.folderStats = stats
-			} catch (error) {
-				this.folderStats = {error: true}
-				logger.error(`could not load folder stats for ${this.folder.id}`, error)
-			}
-		},
-
-		createFolder(e) {
-			const name = e.target.elements[1].value
-			const withPrefix = atob(this.folder.id) + this.folder.delimiter + name
-			logger.info(`creating folder ${withPrefix} as subfolder of ${this.folder.id}`)
-			this.menuOpen = false
-			this.$store
-				.dispatch('createFolder', {
-					account: this.account,
-					name: withPrefix,
-				})
-				.then(() => logger.info(`folder ${withPrefix} created`))
-				.catch((error) => {
-					logger.error(`could not create folder ${withPrefix}`, {error})
-					throw error
-				})
-		},
-		markAsRead() {
-			this.loadingMarkAsRead = true
-
-			this.$store
-				.dispatch('markFolderRead', {
-					accountId: this.account.id,
-					folderId: this.folder.id,
-				})
-				.then(() => logger.info(`folder ${this.folder.id} marked as read`))
-				.catch((error) => logger.error(`could not mark folder ${this.folder.id} as read`, {error}))
-				.then(() => (this.loadingMarkAsRead = false))
-		},
-		async clearCache() {
-			try {
-				this.clearingCache = true
-				logger.debug('clearing message cache', {
-					accountId: this.account.id,
-					folderId: this.folder.id,
-				})
-
-				await clearCache(this.account.id, this.folder.id)
-
-				// TODO: there might be a nicer way to handle this
-				window.location.reload(false)
-			} finally {
-				this.clearCache = false
-			}
-		},
-		async renameFolder(event) {
-			this.renameInput = false
-			this.showSaving = true
-
-			const newName = event.target.querySelector('input[type=text]').value
-			try {
-				await this.$store.dispatch('renameFolder', {
-					account: this.account,
-					folder: this.folder,
-					newName,
-				})
-				this.renameLabel = true
-				this.renameInput = false
-				this.showSaving = false
-			} catch (error) {
-				showInfo(t('mail', 'An error occurred, unable to rename the folder.'))
-				console.error(error)
-				this.renameLabel = false
-				this.renameInput = true
-				this.showSaving = false
-			}
-		},
-		openRenameInput() {
-			// Hide label and show input
-			this.renameLabel = false
-			this.renameInput = true
-			this.showSaving = false
-		},
-	},
-}
-</script>
diff --git a/src/components/NavigationMailbox.vue b/src/components/NavigationMailbox.vue
index feb25b35f3..17230b58bf 100644
--- a/src/components/NavigationMailbox.vue
+++ b/src/components/NavigationMailbox.vue
@@ -50,7 +50,6 @@
 					@click="markAsRead">
 					{{ t('mail', 'Mark all messages of this mailbox as read') }}
 				</ActionButton>
-
 				<ActionButton
 					v-if="!editing && top && !account.isUnified && mailbox.specialRole !== 'flagged'"
 					icon="icon-folder"
@@ -58,6 +57,19 @@
 					{{ t('mail', 'Add subfolder') }}
 				</ActionButton>
 				<ActionInput v-if="editing" icon="icon-folder" @submit.prevent.stop="createMailbox" />
+				<ActionText v-if="showSaving" icon="icon-loading-small">
+					{{ t('mail', 'Saving') }}
+				<ActionButton
+					v-if="renameLabel && mailbox.specialRole === null"
+					icon="icon-rename"
+					@click.prevent.stop="openRenameInput">
+					{{ t('mail', 'Edit name') }}
+				</ActionButton>
+				<ActionInput
+					v-if="renameInput"
+					icon="icon-rename"
+					:value.sync="mailbox.displayName"
+					@submit.prevent.stop="renameMailbox" />
 				<ActionText v-if="showSaving" icon="icon-loading-small">
 					{{ t('mail', 'Saving') }}
 				</ActionText>
@@ -101,6 +113,7 @@ import { getMailboxStatus } from '../service/MailboxService'
 import logger from '../logger'
 import { translatePlural as n } from '@nextcloud/l10n'
 import { translate as translateMailboxName } from '../i18n/MailboxTranslator'
+import { showInfo } from '@nextcloud/dialogs'
 
 export default {
 	name: 'NavigationMailbox',
@@ -140,6 +153,9 @@ export default {
 			editing: false,
 			showSubMailboxes: false,
 			menuOpen: false,
+			renameLabel: true,
+			renameInput: false,
+
 		}
 	},
 	computed: {
@@ -317,6 +333,34 @@ export default {
 				}
 			)
 		},
+		async renameMailbox(event) {
+			this.renameInput = false
+			this.showSaving = true
+
+			const newName = event.target.querySelector('input[type=text]').value
+			try {
+				await this.$store.dispatch('renameMailbox', {
+					account: this.account,
+					mailbox: this.mailbox,
+					newName,
+				})
+				this.renameLabel = true
+				this.renameInput = false
+				this.showSaving = false
+			} catch (error) {
+				showInfo(t('mail', 'An error occurred, unable to rename the folder.'))
+				console.error(error)
+				this.renameLabel = false
+				this.renameInput = true
+				this.showSaving = false
+			}
+		},
+		openRenameInput() {
+			// Hide label and show input
+			this.renameLabel = false
+			this.renameInput = true
+			this.showSaving = false
+		},
 	},
 }
 </script>
diff --git a/src/service/FolderService.js b/src/service/FolderService.js
deleted file mode 100644
index 3a3289f931..0000000000
--- a/src/service/FolderService.js
+++ /dev/null
@@ -1,51 +0,0 @@
-import {generateUrl} from '@nextcloud/router'
-import Axios from '@nextcloud/axios'
-
-export function fetchAll(accountId) {
-	const url = generateUrl('/apps/mail/api/accounts/{accountId}/folders', {
-		accountId,
-	})
-
-	// FIXME: this return format is weird and should be avoided
-	// TODO: respect `resp.data.delimiter` value
-	return Axios.get(url).then((resp) => resp.data.folders)
-}
-
-export function create(accountId, name) {
-	const url = generateUrl('/apps/mail/api/accounts/{accountId}/folders', {
-		accountId,
-	})
-
-	const data = {
-		name,
-	}
-	return Axios.post(url, data).then((resp) => resp.data)
-}
-
-export function getFolderStats(accountId, folderId) {
-	const url = generateUrl('/apps/mail/api/accounts/{accountId}/folders/{folderId}/stats', {
-		accountId,
-		folderId,
-	})
-
-	return Axios.get(url).then((resp) => resp.data)
-}
-
-export function markFolderRead(accountId, folderId) {
-	const url = generateUrl('/apps/mail/api/accounts/{accountId}/folders/{folderId}/read', {
-		accountId,
-		folderId,
-	})
-
-	return Axios.post(url).then((resp) => resp.data)
-}
-
-export async function patchFolder(accountId, folderId, data) {
-	const url = generateUrl('/apps/mail/api/accounts/{accountId}/folders/{folderId}', {
-		accountId,
-		folderId,
-	})
-
-	const response = await Axios.patch(url, data)
-	return response.data.data
-}
diff --git a/src/service/MailboxService.js b/src/service/MailboxService.js
index 0b0e38c4ed..e895d24fc0 100644
--- a/src/service/MailboxService.js
+++ b/src/service/MailboxService.js
@@ -46,3 +46,12 @@ export const deleteMailbox = async(id) => {
 
 	await axios.delete(url)
 }
+export async function patchMailbox(accountId, mailboxId, data) {
+	const url = generateUrl('/apps/mail/api/accounts/{accountId}/mailboxes/{mailboxId}', {
+		accountId,
+		mailboxId,
+	})
+
+	const response = await axios.patch(url, data)
+	return response.data.data
+}
diff --git a/src/store/actions.js b/src/store/actions.js
index 659e0b9463..8f04e53b26 100644
--- a/src/store/actions.js
+++ b/src/store/actions.js
@@ -55,6 +55,7 @@ import {
 	deleteMailbox,
 	fetchAll as fetchAllMailboxes,
 	markMailboxRead,
+	patchMailbox,
 } from '../service/MailboxService'
 import {
 	deleteMessage,
@@ -669,12 +670,13 @@ export default {
 	async deleteAlias({ commit }, { account, aliasToDelete }) {
 		await deleteAlias(account, aliasToDelete)
 		commit('deleteAlias', { account, alias: aliasToDelete })
-	async renameFolder({commit}, {account, folder, newName}) {
-		await patchFolder(account.id, folder.id, {
+	},
+	async renameMailbox({ commit }, { account, mailbox, newName }) {
+		await patchMailbox(account.id, mailbox.id, {
 			name: newName,
 		})
 
-		console.debug(`folder ${folder.id} renamed to ${newName}`, {folder})
-		commit('renameFolder', {accountId: account.id, folder, newName})
+		console.debug(`folder ${mailbox.id} renamed to ${newName}`, { mailbox })
+		commit('renameMailbox', { accountId: account.id, mailbox, newName })
 	},
 }
diff --git a/src/store/mutations.js b/src/store/mutations.js
index 38d764a915..6d5dc7ea20 100644
--- a/src/store/mutations.js
+++ b/src/store/mutations.js
@@ -218,19 +218,19 @@ export default {
 	deleteAlias(state, { account, alias }) {
 		account.aliases.splice(account.aliases.indexOf(alias), 1)
 	},
-	renameFolder(state, { accountId, folder, newName }) {
-		const oldId = folder.id
+	renameMailbox(state, { accountId, mailbox, newName }) {
+		const oldId = mailbox.id
 
 		// Remove the old entry
 		Vue.delete(state.folders, normalizedFolderId(accountId, oldId))
 		// Update the ID
-		folder.id = btoa(newName)
+		mailbox.id = btoa(newName)
 		// Set the new entry
-		Vue.set(state.folders, normalizedFolderId(accountId, folder.id), folder)
+		Vue.set(state.mailbox, normalizedFolderId(accountId, mailbox.id), mailbox)
 
 		// Update the reference
 		const oldNormalized = normalizedFolderId(accountId, oldId)
-		state.accounts[accountId].folders = state.accounts[accountId].folders.filter(id => id !== oldNormalized)
-		state.accounts[accountId].folders.push(normalizedFolderId(accountId, folder.id))
+		state.accounts[accountId].mailboxes = state.accounts[accountId].mailboxes.filter(id => id !== oldNormalized)
+		state.accounts[accountId].mailboxes.push(normalizedFolderId(accountId, mailbox.id))
 	},
 }