From 6d2758ced4d7327f08bb9ef928ba390b5bd6448b Mon Sep 17 00:00:00 2001
From: greta <gretadoci@gmail.com>
Date: Fri, 25 Apr 2025 13:38:02 +0200
Subject: [PATCH 1/2] fix: show submailboxes for filtering

Signed-off-by: greta <gretadoci@gmail.com>
---
 src/components/mailFilter/ActionFileinto.vue | 28 +++++++++++++++-----
 1 file changed, 22 insertions(+), 6 deletions(-)

diff --git a/src/components/mailFilter/ActionFileinto.vue b/src/components/mailFilter/ActionFileinto.vue
index 3c5a57813c..f97cc7a8f3 100644
--- a/src/components/mailFilter/ActionFileinto.vue
+++ b/src/components/mailFilter/ActionFileinto.vue
@@ -5,8 +5,9 @@
 <template>
 	<NcSelect ref="select"
 		:value="mailbox"
-		:options="mailboxes"
+		:options="mailboxOptions"
 		:required="true"
+		:aria-label-combobox="t('mail','Select a mailbox')"
 		@input="onInput" />
 </template>
 <script>
@@ -36,13 +37,28 @@ export default {
 		mailbox() {
 			return this.action.mailbox ?? undefined
 		},
-		mailboxes() {
-			const mailboxes = this.mainStore.getMailboxes(this.account.accountId)
+		mailboxOptions() {
+			const result = []
+
+			const topMailboxes = this.mainStore.getMailboxes(this.account.accountId)
 				.filter(mailbox => mailboxHasRights(mailbox, 'i'))
 
-			return mailboxes.map((mailbox) => {
-				return mailbox.displayName
-			})
+			for (const mailbox of topMailboxes) {
+				result.push({
+					value: mailbox,
+					label: mailbox.displayName,
+				})
+
+				const subMailboxes = this.mainStore.getSubMailboxes(mailbox.databaseId)
+				for (const subMailbox of subMailboxes) {
+					result.push({
+						value: subMailbox,
+						label: ` > ${subMailbox.displayName}`,
+					})
+				}
+			}
+
+			return result
 		},
 	},
 	methods: {

From f4c50e07502cc05c6d09239296efa546ec04de52 Mon Sep 17 00:00:00 2001
From: greta <gretadoci@gmail.com>
Date: Mon, 28 Apr 2025 15:56:35 +0200
Subject: [PATCH 2/2] fixup! fix: show submailboxes for filtering

Signed-off-by: greta <gretadoci@gmail.com>
---
 src/components/MailboxInlinePicker.vue       |  1 +
 src/components/mailFilter/Action.vue         |  1 -
 src/components/mailFilter/ActionFileinto.vue | 48 +++++++-------------
 3 files changed, 18 insertions(+), 32 deletions(-)

diff --git a/src/components/MailboxInlinePicker.vue b/src/components/MailboxInlinePicker.vue
index 30e6e8b1af..da4394b23f 100644
--- a/src/components/MailboxInlinePicker.vue
+++ b/src/components/MailboxInlinePicker.vue
@@ -92,6 +92,7 @@ export default {
 input.vue-treeselect__input {
 	margin: 0;
 	padding: 0;
+	border: 1px solid var(--color-border-maxcontrast) !important;
 }
 .vue-treeselect__menu {
 	background: var(--color-main-background);
diff --git a/src/components/mailFilter/Action.vue b/src/components/mailFilter/Action.vue
index 7f5754d780..9853114a4e 100644
--- a/src/components/mailFilter/Action.vue
+++ b/src/components/mailFilter/Action.vue
@@ -93,6 +93,5 @@ export default {
 .mail-filter-row {
 	display: flex;
 	gap: 5px;
-	align-items: baseline;
 }
 </style>
diff --git a/src/components/mailFilter/ActionFileinto.vue b/src/components/mailFilter/ActionFileinto.vue
index f97cc7a8f3..a5614c4b8f 100644
--- a/src/components/mailFilter/ActionFileinto.vue
+++ b/src/components/mailFilter/ActionFileinto.vue
@@ -3,24 +3,19 @@
   - SPDX-License-Identifier: AGPL-3.0-or-later
 -->
 <template>
-	<NcSelect ref="select"
-		:value="mailbox"
-		:options="mailboxOptions"
-		:required="true"
-		:aria-label-combobox="t('mail','Select a mailbox')"
-		@input="onInput" />
+	<MailboxInlinePicker v-model="selectedMailbox" :account="account" />
 </template>
 <script>
 
-import NcSelect from '@nextcloud/vue/components/NcSelect'
-import { mailboxHasRights } from '../../util/acl.js'
 import { mapStores } from 'pinia'
 import useMainStore from '../../store/mainStore.js'
+import MailboxInlinePicker from '../MailboxInlinePicker.vue'
+import logger from '../../logger.js'
 
 export default {
 	name: 'ActionFileinto',
 	components: {
-		NcSelect,
+		MailboxInlinePicker,
 	},
 	props: {
 		action: {
@@ -32,33 +27,24 @@ export default {
 			required: true,
 		},
 	},
+	data() {
+		return {
+			currentSelectedMailboxId: null,
+		}
+	},
 	computed: {
 		...mapStores(useMainStore),
 		mailbox() {
 			return this.action.mailbox ?? undefined
 		},
-		mailboxOptions() {
-			const result = []
-
-			const topMailboxes = this.mainStore.getMailboxes(this.account.accountId)
-				.filter(mailbox => mailboxHasRights(mailbox, 'i'))
-
-			for (const mailbox of topMailboxes) {
-				result.push({
-					value: mailbox,
-					label: mailbox.displayName,
-				})
-
-				const subMailboxes = this.mainStore.getSubMailboxes(mailbox.databaseId)
-				for (const subMailbox of subMailboxes) {
-					result.push({
-						value: subMailbox,
-						label: ` > ${subMailbox.displayName}`,
-					})
-				}
-			}
-
-			return result
+		selectedMailbox: {
+			get() {
+				return this.currentSelectedMailboxId
+			},
+			set(selectedMailboxId) {
+				logger.debug('Selected mailbox set to', selectedMailboxId)
+				this.currentSelectedMailboxId = selectedMailboxId
+			},
 		},
 	},
 	methods: {