Merge pull request #10137 from nextcloud/feat/mail-filters/frontend

move files
nextcloud · Sep 18, 2024 · de67c78 · de67c78
2 parents ed730e9 + a3cc9f5
commit de67c78
Show file tree

Hide file tree

Showing 12 changed files with 196 additions and 274 deletions.
diff --git a/src/components/AccountSettings.vue b/src/components/AccountSettings.vue
@@ -111,7 +111,7 @@ import CertificateSettings from './CertificateSettings.vue'
 import SearchSettings from './SearchSettings.vue'
 import TrashRetentionSettings from './TrashRetentionSettings.vue'
 import logger from '../logger.js'
-import MailFilters from './MailFilters.vue'
+import MailFilters from './mailFilter/MailFilters.vue'
 
 export default {
 	name: 'AccountSettings',

diff --git a/src/components/MailFilterTest.vue b/src/components/MailFilterTest.vue
diff --git a/src/components/MailFilterAction.vue → ...omponents/mailFilter/MailFilterAction.vue b/src/components/MailFilterAction.vue → ...omponents/mailFilter/MailFilterAction.vue
@@ -23,6 +23,7 @@
 			<NcButton aria-label="Delete action"
 				type="tertiary-no-background"
 				@click="deleteAction">
+				{{ t('mail', 'Delete action') }}
 				<template #icon>
 					<DeleteIcon :size="20" />
 				</template>
@@ -77,12 +78,6 @@ export default {
 		},
 	},
 	methods: {
-		// changeActionType(value) {
-		// 	this.changeAction({
-		// 		id: this.action.id,
-		// 		type: value,
-		// 	})
-		// },
 		updateAction(properties) {
 			this.$emit('update-action', { ...this.action, ...properties })
 		},
@@ -98,27 +93,4 @@ export default {
 	gap: 5px;
 	align-items: baseline;
 }
-//
-//.mail-filter-column label {
-//	display: block;
-//}
-//
-//.form-group {
-//	margin: calc(var(--default-grid-baseline) * 4) 0;
-//	display: flex;
-//	flex-direction: column;
-//	align-items: flex-start;
-//}
-//
-//.external-label {
-//	display: flex;
-//	width: 100%;
-//	margin-top: 1rem;
-//}
-//
-//.external-label label {
-//	padding-top: 7px;
-//	padding-right: 14px;
-//	white-space: nowrap;
-//}
 </style>
diff --git a/src/components/MailFilterActionAddflag.vue → ...ts/mailFilter/MailFilterActionAddflag.vue b/src/components/MailFilterActionAddflag.vue → ...ts/mailFilter/MailFilterActionAddflag.vue
diff --git a/src/components/MailFilterActionFileinto.vue → ...s/mailFilter/MailFilterActionFileinto.vue b/src/components/MailFilterActionFileinto.vue → ...s/mailFilter/MailFilterActionFileinto.vue
@@ -11,7 +11,7 @@
 <script>
 
 import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
-import { mailboxHasRights } from '../util/acl.js'
+import { mailboxHasRights } from '../../util/acl.js'
 export default {
 	name: 'MailFilterActionFileinto',
 	components: {

diff --git a/src/components/MailFilterDeleteModal.vue → ...ents/mailFilter/MailFilterDeleteModal.vue b/src/components/MailFilterDeleteModal.vue → ...ents/mailFilter/MailFilterDeleteModal.vue
diff --git a/src/components/MailFilterOperator.vue → ...ponents/mailFilter/MailFilterOperator.vue b/src/components/MailFilterOperator.vue → ...ponents/mailFilter/MailFilterOperator.vue
@@ -8,24 +8,20 @@
 			<p>{{ t('mail', 'Operator') }}</p>
 		</div>
 		<div class="mail-filter-row">
-			<NcCheckboxRadioSwitch :checked.sync="filter.operator"
+			<NcCheckboxRadioSwitch :checked="filter.operator"
 				value="allof"
 				name="sharing_permission_radio"
-				type="radio">
+				type="radio"
+				@update:checked="updateFilter('allof')">
 				{{ t('mail', 'allof') }}
 			</NcCheckboxRadioSwitch>
-			<NcCheckboxRadioSwitch :checked.sync="filter.operator"
+			<NcCheckboxRadioSwitch :checked="filter.operator"
 				value="anyof"
 				name="sharing_permission_radio"
-				type="radio">
+				type="radio"
+				@update:checked="updateFilter('anyof')">
 				{{ t('mail', 'anyof') }}
 			</NcCheckboxRadioSwitch>
-			<NcCheckboxRadioSwitch :checked.sync="filter.operator"
-				value="true"
-				name="sharing_permission_radio"
-				type="radio">
-				{{ t('mail', 'true') }}
-			</NcCheckboxRadioSwitch>
 		</div>
 	</div>
 </template>
@@ -43,6 +39,11 @@ export default {
 			required: true,
 		},
 	},
+	methods: {
+		updateFilter(operator) {
+			this.$emit('update:operator', operator)
+		},
+	},
 }
 </script>
 <style lang="scss" scoped>