fixup! feat: mail filters

Signed-off-by: Hamza Mahjoubi <[email protected]>

src/components/mailFilter/MailFilterAction.vue → src/components/mailFilter/Action.vue

@@ -32,19 +32,19 @@
 	</div>
 </template>
 <script>
-import MailFilterActionFileinto from './MailFilterActionFileinto.vue'
-import MailFilterActionAddflag from './MailFilterActionAddflag.vue'
+import ActionFileinto from './ActionFileinto.vue'
+import ActionAddflag from './ActionAddflag.vue'
 import { NcButton, NcSelect, NcTextField } from '@nextcloud/vue'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 
 export default {
-	name: 'MailFilterAction',
+	name: 'Action',
 	components: {
 		NcSelect,
 		NcTextField,
 		NcButton,
-		MailFilterActionFileinto,
-		MailFilterActionAddflag,
+		ActionFileinto,
+		ActionAddflag,
 		DeleteIcon,
 	},
 	props: {
@@ -70,9 +70,9 @@ export default {
 	computed: {
 		componentInstance() {
 			if (this.action.type === 'fileinto') {
-				return MailFilterActionFileinto
+				return ActionFileinto
 			} else if (this.action.type === 'addflag') {
-				return MailFilterActionAddflag
+				return ActionAddflag
 			}
 			return null
 		},

src/components/mailFilter/MailFilterActionAddflag.vue → src/components/mailFilter/ActionAddflag.vue

@@ -13,7 +13,7 @@
 import { NcTextField } from '@nextcloud/vue'
 
 export default {
-	name: 'MailFilterActionAddflag',
+	name: 'ActionAddflag',
 	components: {
 		NcTextField,
 	},

src/components/mailFilter/MailFilterActionFileinto.vue → src/components/mailFilter/ActionFileinto.vue

@@ -13,7 +13,7 @@
 import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 import { mailboxHasRights } from '../../util/acl.js'
 export default {
-	name: 'MailFilterActionFileinto',
+	name: 'ActionFileinto',
 	components: {
 		NcSelect,
 	},

src/components/mailFilter/MailFilterDeleteModal.vue → src/components/mailFilter/DeleteModal.vue

@@ -16,7 +16,7 @@ import IconCancel from '@mdi/svg/svg/cancel.svg'
 import IconCheck from '@mdi/svg/svg/check.svg'
 
 export default {
-	name: 'MailFilterDeleteModal',
+	name: 'DeleteModal',
 	components: {
 		NcDialog,
 	},

src/components/mailFilter/MailFilters.vue

@@ -30,13 +30,13 @@
 			@click.prevent.stop="createFilter">
 			{{ t('mail', 'New filter') }}
 		</NcButton>
-		<MailFilterUpdateModal v-if="showUpdateModal && currentFilter"
+		<UpdateModal v-if="showUpdateModal && currentFilter"
 			:filter="currentFilter"
 			:account="account"
 			:loading="loading"
 			@update-filter="updateFilter"
 			@close="closeModal" />
-		<MailFilterDeleteModal v-if="showDeleteModal && currentFilter"
+		<DeleteModal v-if="showDeleteModal && currentFilter"
 			:filter="currentFilter"
 			:open="showDeleteModal"
 			:loading="loading"
@@ -47,13 +47,13 @@
 
 <script>
 import { NcActionButton, NcListItem, NcButton } from '@nextcloud/vue'
-import MailFilterUpdateModal from './MailFilterUpdateModal.vue'
+import UpdateModal from './UpdateModal.vue'
 import { randomId } from '../../util/randomId.js'
 import logger from '../../logger.js'
 import { mapStores } from 'pinia'
 import useMailFilterStore from '../../store/mailFilterStore.js'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
-import MailFilterDeleteModal from './MailFilterDeleteModal.vue'
+import DeleteModal from './DeleteModal.vue'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 
 export default {
@@ -62,9 +62,9 @@ export default {
 		NcButton,
 		NcListItem,
 		NcActionButton,
-		MailFilterUpdateModal,
+		UpdateModal,
 		DeleteIcon,
-		MailFilterDeleteModal,
+		DeleteModal,
 
 	},
 	props: {

src/components/mailFilter/MailFilterOperator.vue → src/components/mailFilter/Operator.vue

@@ -29,7 +29,7 @@
 import { NcCheckboxRadioSwitch } from '@nextcloud/vue'
 
 export default {
-	name: 'MailFilterOperator',
+	name: 'Operator',
 	components: {
 		NcCheckboxRadioSwitch,
 	},

src/components/mailFilter/MailFilterTest.vue → src/components/mailFilter/Test.vue

@@ -54,7 +54,7 @@ import { NcButton, NcSelect } from '@nextcloud/vue'
 import DeleteIcon from 'vue-material-design-icons/Delete.vue'
 
 export default {
-	name: 'MailFilterTest',
+	name: 'Test',
 	components: {
 		NcButton,
 		NcSelect,

src/components/mailFilter/MailFilterUpdateModal.vue → src/components/mailFilter/UpdateModal.vue

@@ -15,12 +15,12 @@
 			</div>
 
 			<div class="filter-operator">
-				<MailFilterOperator :filter="clone" @update:operator="updateOperator" />
+				<Operator :filter="clone" @update:operator="updateOperator" />
 			</div>
 
 			<div class="filter-tests">
 				<p>{{ t('mail', 'Tests') }}</p>
-				<MailFilterTest v-for="test in clone.tests"
+				<Test v-for="test in clone.tests"
 					:key="test.id"
 					:test="test"
 					@update-test="updateTest"
@@ -35,7 +35,7 @@
 
 			<div class="filter-actions">
 				<p>{{ t('mail', 'Actions') }}</p>
-				<MailFilterAction v-for="action in clone.actions"
+				<Action v-for="action in clone.actions"
 					:key="action.id"
 					:action="action"
 					:account="account"
@@ -72,19 +72,19 @@
 </template>
 <script>
 import { NcButton, NcCheckboxRadioSwitch, NcModal, NcTextField, NcLoadingIcon } from '@nextcloud/vue'
-import MailFilterTest from './MailFilterTest.vue'
-import MailFilterOperator from './MailFilterOperator.vue'
+import Test from './Test.vue'
+import Operator from './Operator.vue'
 import { randomId } from '../../util/randomId.js'
-import MailFilterAction from './MailFilterAction.vue'
+import Action from './Action.vue'
 import IconCheck from 'vue-material-design-icons/Check.vue'
 
 export default {
-	name: 'MailFilterUpdateModal',
+	name: 'UpdateModal',
 	components: {
 		IconCheck,
-		MailFilterAction,
-		MailFilterOperator,
-		MailFilterTest,
+		Action,
+		Operator,
+		Test,
 		NcButton,
 		NcCheckboxRadioSwitch,
 		NcLoadingIcon,