Merge branch 'main' into feature/redirect-to-specific-view

# Conflicts:
#	src/components/sharing/linkSharing.vue

src/views/filters/FilterEdit.vue

@@ -68,7 +68,7 @@ import SavedFilterService from '@/services/savedFilter'
 
 import {objectToSnakeCase} from '@/helpers/case'
 import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
-import type { IList } from '@/models/list'
+import type {IList} from '@/modelTypes/IList'
 
 const {t} = useI18n({useScope: 'global'})
 

src/views/labels/ListLabels.vue

@@ -113,7 +113,8 @@
 import {defineComponent} from 'vue'
 import {mapState} from 'vuex'
 
-import LabelModel, { type ILabel } from '../../models/label'
+import LabelModel from '@/models/label'
+import type {ILabel} from '@/modelTypes/ILabel'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 
 import BaseButton from '@/components/base/BaseButton.vue'

src/views/list/ListList.vue

@@ -153,7 +153,7 @@ import {ALPHABETICAL_SORT} from '@/components/list/partials/filters.vue'
 
 import draggable from 'zhyswan-vuedraggable'
 import {calculateItemPosition} from '../../helpers/calculateItemPosition'
-import type { ITask } from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 function sortTasks(tasks: ITask[]) {
 	if (tasks === null || Array.isArray(tasks) && tasks.length === 0) {

src/views/list/ListTable.vue

@@ -197,7 +197,7 @@ import Pagination from '@/components/misc/pagination.vue'
 import Popup from '@/components/misc/popup.vue'
 
 import {useTaskList} from '@/composables/taskList'
-import type { ITask } from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 const ACTIVE_COLUMNS_DEFAULT = {
 	id: true,

src/views/tasks/ShowTasks.vue

@@ -4,7 +4,7 @@
 			{{ pageTitle }}
 		</h3>
 		<p v-if="!showAll" class="show-tasks-options">
-			<datepicker-with-range @dateChanged="setDate">
+			<datepicker-with-range @update:model-value="setDate">
 				<template #trigger="{toggle}">
 					<x-button @click.prevent.stop="toggle()" variant="primary" :shadow="false" class="mb-2">
 						{{ $t('task.show.select') }}
@@ -58,7 +58,7 @@ import DatepickerWithRange from '@/components/date/datepickerWithRange.vue'
 import {DATE_RANGES} from '@/components/date/dateRanges'
 import {LOADING, LOADING_MODULE} from '@/store/mutation-types'
 import LlamaCool from '@/assets/llama-cool.svg?component'
-import type { ITask } from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 const store = useStore()
 const route = useRoute()

src/views/tasks/TaskDetailView.vue

@@ -39,7 +39,7 @@
 								</div>
 								<priority-select
 									:disabled="!canWrite"
-									@change="saveTask"
+									@update:model-value="saveTask"
 									ref="priority"
 									v-model="task.priority"/>
 							</div>
@@ -79,7 +79,7 @@
 								</div>
 								<percent-done-select
 									:disabled="!canWrite"
-									@change="saveTask"
+									@update:model-value="saveTask"
 									ref="percentDone"
 									v-model="task.percentDone"/>
 							</div>
@@ -146,9 +146,10 @@
 								</div>
 								<reminders
 									:disabled="!canWrite"
-									@change="saveTask"
 									ref="reminders"
-									v-model="task.reminderDates"/>
+									v-model="task.reminderDates"
+									@update:model-value="saveTask"
+								/>
 							</div>
 						</transition>
 						<transition name="flash-background" appear>
@@ -170,9 +171,10 @@
 								</div>
 								<repeat-after
 									:disabled="!canWrite"
-									@change="saveTask"
 									ref="repeatAfter"
-									v-model="task"/>
+									v-model="task"
+									@update:model-value="saveTask"
+								/>
 							</div>
 						</transition>
 						<transition name="flash-background" appear>
@@ -183,10 +185,11 @@
 									{{ $t('task.attributes.color') }}
 								</div>
 								<color-picker
-									@change="saveTask"
 									menu-position="bottom"
 									ref="color"
-									v-model="taskColor"/>
+									v-model="taskColor"
+									@update:model-value="saveTask"
+								/>
 							</div>
 						</transition>
 					</div>
@@ -276,8 +279,8 @@
 						<task-subscription
 							entity="task"
 							:entity-id="task.id"
-							:subscription="task.subscription"
-							@change="sub => task.subscription = sub"
+							:model-value="task.subscription"
+							@update:model-value="sub => task.subscription = sub"
 						/>
 						<x-button
 							@click="setFieldActive('assignees')"
@@ -426,7 +429,8 @@ import {defineComponent} from 'vue'
 import cloneDeep from 'lodash.clonedeep'
 
 import TaskService from '../../services/task'
-import TaskModel, { type ITask } from '@/models/task'
+import TaskModel from '@/models/task'
+import type {ITask} from '@/modelTypes/ITask'
 
 import { PRIORITIES as priorites } from '@/constants/priorities'
 import {RIGHTS as rights} from '@/constants/rights'
@@ -456,7 +460,7 @@ import CreatedUpdated from '@/components/tasks/partials/createdUpdated.vue'
 import { setTitle } from '@/helpers/setTitle'
 import {getNamespaceTitle} from '@/helpers/getNamespaceTitle'
 import {getListTitle} from '@/helpers/getListTitle'
-import type { IList } from '@/models/list'
+import type { IList } from '@/modelTypes/IList'
 
 function scrollIntoView(el) {
 	if (!el) {

src/views/teams/EditTeam.vue

@@ -177,9 +177,9 @@ import Multiselect from '@/components/input/multiselect.vue'
 import {useRoute, useRouter} from 'vue-router'
 import {useTitle} from '@/composables/useTitle'
 import {success} from '@/message'
-import type { ITeam } from '@/models/team'
-import type { IUser } from '@/models/user'
-import type { ITeamMember } from '@/models/teamMember'
+import type {ITeam} from '@/modelTypes/ITeam'
+import type {IUser} from '@/modelTypes/IUser'
+import type {ITeamMember} from '@/modelTypes/ITeamMember'
 
 const store = useStore()
 const route = useRoute()

src/views/user/settings/Caldav.vue

@@ -78,7 +78,7 @@ import BaseButton from '@/components/base/BaseButton.vue'
 import Message from '@/components/misc/message.vue'
 import CaldavTokenService from '@/services/caldavToken'
 import { formatDateShort } from '@/helpers/time/formatDate'
-import type { ICaldavToken } from '@/models/caldavToken'
+import type {ICaldavToken} from '@/modelTypes/ICaldavToken'
 
 const copy = useCopyToClipboard()