Merge branch 'main' into vue3

# Conflicts:
#	src/components/input/editor.vue
#	src/components/list/partials/filters.vue
#	src/components/tasks/partials/editAssignees.vue
#	src/helpers/find.ts
#	src/helpers/time/formatDate.js
#	src/main.ts
#	src/store/modules/attachments.js
#	src/store/modules/kanban.js
#	src/views/list/views/List.vue
#	yarn.lock

src/components/tasks/gantt-component.vue

@@ -102,7 +102,7 @@
 					>
 						{{ t.title }}
 					</span>
-					<priority-label :priority="t.priority"/>
+					<priority-label :priority="t.priority" :done="t.done"/>
 					<!-- using the key here forces vue to use the updated version model and not the response returned by the api -->
 					<a @click="editTask(theTasks[k])" class="edit-toggle">
 						<icon icon="pen"/>
@@ -192,7 +192,6 @@ import TaskCollectionService from '../../services/taskCollection'
 import {mapState} from 'vuex'
 import Rights from '../../models/constants/rights.json'
 import FilterPopup from '@/components/list/partials/filter-popup.vue'
-import {format} from 'date-fns'
 
 export default {
 	name: 'GanttChart',
@@ -466,7 +465,7 @@ export default {
 				})
 		},
 		formatYear(date) {
-			return format(date, 'MMMM, yyyy')
+			return this.format(date, 'MMMM, yyyy')
 		},
 	},
 }

src/components/tasks/mixins/taskList.js

@@ -1,5 +1,4 @@
 import TaskCollectionService from '@/services/taskCollection'
-import cloneDeep from 'lodash/cloneDeep'
 
 // FIXME: merge with DEFAULT_PARAMS in filters.vue
 const DEFAULT_PARAMS = {
@@ -83,7 +82,7 @@ export default {
 					this.tasks = r
 					this.currentPage = page
 
-					this.loadedList = cloneDeep(currentList)
+					this.loadedList = JSON.parse(JSON.stringify(currentList))
 				})
 				.catch(e => {
 					this.$message.error(e)

src/components/tasks/partials/editAssignees.vue

@@ -29,8 +29,7 @@
 </template>
 
 <script>
-import differenceWith from 'lodash/differenceWith'
-
+import {includesById} from '@/helpers/utils'
 import UserModel from '../../../models/user'
 import ListUserService from '../../../services/listUsers'
 import TaskAssigneeService from '../../../services/taskAssignee'
@@ -112,9 +111,7 @@ export default {
 			this.listUserService.getAll({listId: this.listId}, {s: query})
 				.then(response => {
 					// Filter the results to not include users who are already assigned
-					this.foundUsers = differenceWith(response, this.assignees, (first, second) => {
-						return first.id === second.id
-					})
+					this.foundUsers = response.filter(({id}) => !includesById(this.assignees, id))
 				})
 				.catch(e => {
 					this.$message.error(e)

src/components/tasks/partials/editLabels.vue

@@ -38,8 +38,6 @@
 </template>
 
 <script>
-import differenceWith from 'lodash/differenceWith'
-
 import LabelModel from '../../../models/label'
 import LabelTaskService from '../../../services/labelTask'
 
@@ -84,13 +82,7 @@ export default {
 	},
 	computed: {
 		foundLabels() {
-			const labels = (Object.values(this.$store.state.labels.labels).filter(l => {
-				return l.title.toLowerCase().includes(this.query.toLowerCase())
-			}) ?? [])
-
-			return differenceWith(labels, this.labels, (first, second) => {
-				return first.id === second.id
-			})
+			return this.$store.getters['labels/filterLabelsByQuery'](this.labels, this.query)
 		},
 		loading() {
 			return this.labelTaskService.loading || (this.$store.state[LOADING] && this.$store.state[LOADING_MODULE] === 'labels')
@@ -157,7 +149,7 @@ export default {
 				.then(r => {
 					this.addLabel(r, false)
 					this.labels.push(r)
-					this.$message.success({message: this.$t('task.label.removeSuccess')})
+					this.$message.success({message: this.$t('task.label.addCreateSuccess')})
 				})
 				.catch(e => {
 					this.$message.error(e)

src/components/tasks/partials/kanban-card.vue

@@ -41,7 +41,7 @@
 		</progress>
 		<div class="footer">
 			<labels :labels="task.labels"/>
-			<priority-label :priority="task.priority"/>
+			<priority-label :priority="task.priority" :done="task.done"/>
 			<div class="assignees" v-if="task.assignees.length > 0">
 				<user
 					:avatar-size="24"
@@ -51,6 +51,7 @@
 					v-for="u in task.assignees"
 				/>
 			</div>
+			<checklist-summary :task="task"/>
 			<span class="icon" v-if="task.attachments.length > 0">
 				<icon icon="paperclip"/>	
 			</span>
@@ -66,10 +67,12 @@ import {playPop} from '../../../helpers/playPop'
 import PriorityLabel from '../../../components/tasks/partials/priorityLabel'
 import User from '../../../components/misc/user'
 import Labels from '../../../components/tasks/partials/labels'
+import ChecklistSummary from './checklist-summary'
 
 export default {
 	name: 'kanban-card',
 	components: {
+		ChecklistSummary,
 		PriorityLabel,
 		User,
 		Labels,

src/components/tasks/partials/priorityLabel.vue

@@ -2,7 +2,7 @@
 	<span
 		:class="{'not-so-high': priority === priorities.HIGH, 'high-priority': priority >= priorities.HIGH}"
 		class="priority-label"
-		v-if="showAll || priority >= priorities.HIGH">
+		v-if="!done && (showAll || priority >= priorities.HIGH)">
 		<span class="icon" v-if="priority >= priorities.HIGH">
 			<icon icon="exclamation"/>
 		</span>
@@ -39,6 +39,10 @@ export default {
 			type: Boolean,
 			default: false,
 		},
+		done: {
+			type: Boolean,
+			default: false,
+		},
 	},
 }
 </script>

src/components/tasks/partials/relatedTasks.vue

@@ -56,9 +56,9 @@
 					<div class="control is-expanded">
 						<div class="select is-fullwidth has-defaults">
 							<select v-model="newTaskRelationKind">
-								<option value="unset">Select a relation kind</option>
-								<option :key="rk" :value="rk" v-for="(label, rk) in relationKinds">
-									{{ label[0] }}
+								<option value="unset">{{ $t('task.relation.select') }}</option>
+								<option :key="rk" :value="rk" v-for="rk in relationKinds">
+									{{ $tc(`task.relation.kinds.${rk}`, 1) }}
 								</option>
 							</select>
 						</div>
@@ -256,10 +256,7 @@ export default {
 				})
 		},
 		relationKindTitle(kind, length) {
-			if (length > 1) {
-				return relationKinds[kind][1]
-			}
-			return relationKinds[kind][0]
+			return this.$tc(`task.relation.kinds.${kind}`, length)
 		},
 	},
 }

src/components/tasks/partials/singleTaskInList.vue

@@ -50,7 +50,7 @@
 			<transition name="fade">
 				<defer-task v-if="+new Date(task.dueDate) > 0 && showDefer" v-model="task" ref="deferDueDate"/>
 			</transition>
-			<priority-label :priority="task.priority"/>
+			<priority-label :priority="task.priority" :done="task.done"/>
 			<span>
 				<span class="list-task-icon" v-if="task.attachments.length > 0">
 					<icon icon="paperclip"/>