feat: function attribute typing
This commit is contained in:
parent
8fb00653e4
commit
332acf012c
17 changed files with 48 additions and 41 deletions
|
@ -209,7 +209,7 @@ function resize() {
|
|||
store.commit(MENU_ACTIVE, window.innerWidth >= 770)
|
||||
}
|
||||
|
||||
function toggleLists(namespaceId: number) {
|
||||
function toggleLists(namespaceId: NamespaceModel['id']) {
|
||||
listsVisible.value[namespaceId] = !listsVisible.value[namespaceId]
|
||||
}
|
||||
|
||||
|
|
|
@ -53,7 +53,7 @@ export default defineComponent({
|
|||
},
|
||||
},
|
||||
methods: {
|
||||
updateData(checked) {
|
||||
updateData(checked: boolean) {
|
||||
this.checked = checked
|
||||
this.$emit('update:modelValue', checked)
|
||||
this.$emit('change', checked)
|
||||
|
|
|
@ -182,6 +182,7 @@ import {useI18n} from 'vue-i18n'
|
|||
|
||||
import {RIGHTS} from '@/models/constants/rights'
|
||||
import LinkShareModel from '@/models/linkShare'
|
||||
import type ListModel from '@/models/list'
|
||||
|
||||
import LinkShareService from '@/services/linkShare'
|
||||
|
||||
|
@ -216,7 +217,7 @@ watch(
|
|||
const store = useStore()
|
||||
const frontendUrl = computed(() => store.state.config.frontendUrl)
|
||||
|
||||
async function load(listId) {
|
||||
async function load(listId: ListModel['id']) {
|
||||
// If listId == 0 the list on the calling component wasn't already loaded, so we just bail out here
|
||||
if (listId === 0) {
|
||||
return
|
||||
|
@ -225,7 +226,7 @@ async function load(listId) {
|
|||
linkShares.value = await linkShareService.getAll({listId})
|
||||
}
|
||||
|
||||
async function add(listId) {
|
||||
async function add(listId: ListModel['id']) {
|
||||
const newLinkShare = new LinkShareModel({
|
||||
right: selectedRight.value,
|
||||
listId,
|
||||
|
@ -241,7 +242,7 @@ async function add(listId) {
|
|||
await load(listId)
|
||||
}
|
||||
|
||||
async function remove(listId) {
|
||||
async function remove(listId: ListModel['id']) {
|
||||
try {
|
||||
await linkShareService.delete(new LinkShareModel({
|
||||
id: linkIdToDelete.value,
|
||||
|
|
|
@ -355,7 +355,7 @@ async function toggleType(sharable) {
|
|||
const found = ref([])
|
||||
|
||||
const currentUserId = computed(() => store.state.auth.info.id)
|
||||
async function find(query) {
|
||||
async function find(query: string) {
|
||||
if (query === '') {
|
||||
found.value = []
|
||||
return
|
||||
|
|
|
@ -148,6 +148,7 @@ import {defineComponent} from 'vue'
|
|||
|
||||
import AttachmentService from '../../../services/attachment'
|
||||
import AttachmentModel from '../../../models/attachment'
|
||||
import type FileModel from '@/models/file'
|
||||
import User from '@/components/misc/user.vue'
|
||||
import {mapState} from 'vuex'
|
||||
|
||||
|
@ -229,7 +230,7 @@ export default defineComponent({
|
|||
})
|
||||
},
|
||||
methods: {
|
||||
downloadAttachment(attachment) {
|
||||
downloadAttachment(attachment: AttachmentModel) {
|
||||
this.attachmentService.download(attachment)
|
||||
},
|
||||
uploadNewAttachment() {
|
||||
|
@ -239,7 +240,7 @@ export default defineComponent({
|
|||
|
||||
this.uploadFiles(this.$refs.files.files)
|
||||
},
|
||||
uploadFiles(files) {
|
||||
uploadFiles(files: FileModel[]) {
|
||||
uploadFiles(this.attachmentService, this.taskId, files)
|
||||
},
|
||||
async deleteAttachment() {
|
||||
|
|
|
@ -163,6 +163,7 @@ import TaskCommentModel from '@/models/taskComment'
|
|||
import {uploadFile} from '@/helpers/attachments'
|
||||
import {success} from '@/message'
|
||||
|
||||
import type TaskModel from '@/models/task'
|
||||
const props = defineProps({
|
||||
taskId: {
|
||||
type: Number,
|
||||
|
@ -213,7 +214,7 @@ function attachmentUpload(...args) {
|
|||
|
||||
const taskCommentService = shallowReactive(new TaskCommentService())
|
||||
|
||||
async function loadComments(taskId) {
|
||||
async function loadComments(taskId: TaskModel['id']) {
|
||||
if (!enabled.value) {
|
||||
return
|
||||
}
|
||||
|
@ -262,7 +263,7 @@ function toggleEdit(comment: TaskCommentModel) {
|
|||
Object.assign(commentEdit, comment)
|
||||
}
|
||||
|
||||
function toggleDelete(commentId) {
|
||||
function toggleDelete(commentId: TaskCommentModel['id']) {
|
||||
showDeleteModal.value = !showDeleteModal.value
|
||||
commentToDelete.id = commentId
|
||||
}
|
||||
|
|
|
@ -220,7 +220,7 @@ export default defineComponent({
|
|||
},
|
||||
},
|
||||
methods: {
|
||||
async findTasks(query) {
|
||||
async findTasks(query: string) {
|
||||
this.query = query
|
||||
this.foundTasks = await this.taskService.getAll({}, {s: query})
|
||||
},
|
||||
|
|
|
@ -186,7 +186,7 @@ export default defineComponent({
|
|||
},
|
||||
},
|
||||
methods: {
|
||||
async markAsDone(checked) {
|
||||
async markAsDone(checked: boolean) {
|
||||
const updateFunc = async () => {
|
||||
const task = await this.taskService.update(this.task)
|
||||
if (this.task.done) {
|
||||
|
@ -211,7 +211,7 @@ export default defineComponent({
|
|||
}
|
||||
},
|
||||
|
||||
undoDone(checked) {
|
||||
undoDone(checked: boolean) {
|
||||
this.task.done = !this.task.done
|
||||
this.markAsDone(!checked)
|
||||
},
|
||||
|
|
|
@ -1,15 +1,15 @@
|
|||
import AbstractService from './abstractService'
|
||||
|
||||
export default class AccountDeleteService extends AbstractService {
|
||||
request(password) {
|
||||
return this.post('/user/deletion/request', {password: password})
|
||||
request(password: string) {
|
||||
return this.post('/user/deletion/request', {password})
|
||||
}
|
||||
|
||||
confirm(token) {
|
||||
return this.post('/user/deletion/confirm', {token: token})
|
||||
confirm(token: string) {
|
||||
return this.post('/user/deletion/confirm', {token})
|
||||
}
|
||||
|
||||
cancel(password) {
|
||||
return this.post('/user/deletion/cancel', {password: password})
|
||||
cancel(password: string) {
|
||||
return this.post('/user/deletion/cancel', {password})
|
||||
}
|
||||
}
|
|
@ -22,9 +22,9 @@ export default class BackgroundUploadService extends AbstractService {
|
|||
* @param file
|
||||
* @returns {Promise<any|never>}
|
||||
*/
|
||||
create(listId, file) {
|
||||
create(listId: ListModel['id'], file) {
|
||||
return this.uploadFile(
|
||||
this.getReplacedRoute(this.paths.create, {listId: listId}),
|
||||
this.getReplacedRoute(this.paths.create, {listId}),
|
||||
file,
|
||||
'background',
|
||||
)
|
||||
|
|
|
@ -2,11 +2,11 @@ import AbstractService from './abstractService'
|
|||
import {downloadBlob} from '../helpers/downloadBlob'
|
||||
|
||||
export default class DataExportService extends AbstractService {
|
||||
request(password) {
|
||||
return this.post('/user/export/request', {password: password})
|
||||
request(password: string) {
|
||||
return this.post('/user/export/request', {password})
|
||||
}
|
||||
|
||||
async download(password) {
|
||||
async download(password: string) {
|
||||
const clear = this.setLoading()
|
||||
try {
|
||||
const url = await this.getBlobUrl('/user/export/download', 'POST', {password})
|
||||
|
|
|
@ -27,7 +27,7 @@ const route = useRoute()
|
|||
|
||||
async function deleteSavedFilter() {
|
||||
// We assume the listId in the route is the pseudolist
|
||||
const savedFilterId = getSavedFilterIdFromListId(route.params.listId)
|
||||
const savedFilterId = getSavedFilterIdFromListId(Number((route.params.listId as string)))
|
||||
|
||||
const filterService = new SavedFilterService()
|
||||
const filter = new SavedFilterModel({id: savedFilterId})
|
||||
|
|
|
@ -52,11 +52,12 @@
|
|||
</template>
|
||||
|
||||
<script setup lang="ts">
|
||||
import {ref, shallowRef, computed, watch} from 'vue'
|
||||
import {ref, shallowRef, computed, watch, unref } from 'vue'
|
||||
import {useRouter, useRoute} from 'vue-router'
|
||||
import {store} from '@/store'
|
||||
import {success} from '@/message'
|
||||
import {useI18n} from 'vue-i18n'
|
||||
import type {MaybeRef} from '@vueuse/core'
|
||||
|
||||
import {default as Editor} from '@/components/input/AsyncEditor'
|
||||
import CreateEdit from '@/components/misc/create-edit.vue'
|
||||
|
@ -67,10 +68,11 @@ import SavedFilterService from '@/services/savedFilter'
|
|||
|
||||
import {objectToSnakeCase} from '@/helpers/case'
|
||||
import {getSavedFilterIdFromListId} from '@/helpers/savedFilter'
|
||||
import type ListModel from '@/models/list'
|
||||
|
||||
const {t} = useI18n({useScope: 'global'})
|
||||
|
||||
function useSavedFilter(listId) {
|
||||
function useSavedFilter(listId: MaybeRef<ListModel['id']>) {
|
||||
const filterService = shallowRef(new SavedFilterService())
|
||||
|
||||
const filter = ref(new SavedFilterModel())
|
||||
|
@ -82,9 +84,9 @@ function useSavedFilter(listId) {
|
|||
})
|
||||
|
||||
// loadSavedFilter
|
||||
watch(listId, async () => {
|
||||
watch(() => unref(listId), async () => {
|
||||
// We assume the listId in the route is the pseudolist
|
||||
const savedFilterId = getSavedFilterIdFromListId(route.params.listId)
|
||||
const savedFilterId = getSavedFilterIdFromListId(Number(route.params.listId as string))
|
||||
|
||||
filter.value = new SavedFilterModel({id: savedFilterId})
|
||||
const response = await filterService.value.get(filter.value)
|
||||
|
@ -110,7 +112,7 @@ function useSavedFilter(listId) {
|
|||
}
|
||||
|
||||
const route = useRoute()
|
||||
const listId = computed(() => route.params.listId)
|
||||
const listId = computed(() => Number(route.params.listId as string))
|
||||
|
||||
const {
|
||||
save,
|
||||
|
|
|
@ -149,7 +149,7 @@ export default defineComponent({
|
|||
loading: state => state[LOADING] && state[LOADING_MODULE] === 'labels',
|
||||
}),
|
||||
methods: {
|
||||
deleteLabel(label) {
|
||||
deleteLabel(label: LabelModel) {
|
||||
this.showDeleteModal = false
|
||||
this.isLabelEdit = false
|
||||
return this.$store.dispatch('labels/deleteLabel', label)
|
||||
|
@ -157,7 +157,7 @@ export default defineComponent({
|
|||
editLabelSubmit() {
|
||||
return this.$store.dispatch('labels/updateLabel', this.labelEditLabel)
|
||||
},
|
||||
editLabel(label) {
|
||||
editLabel(label: LabelModel) {
|
||||
if (label.createdBy.id !== this.userInfo.id) {
|
||||
return
|
||||
}
|
||||
|
@ -179,7 +179,7 @@ export default defineComponent({
|
|||
this.editorActive = false
|
||||
this.$nextTick(() => this.editorActive = true)
|
||||
},
|
||||
showDeleteDialoge(label) {
|
||||
showDeleteDialoge(label: LabelModel) {
|
||||
this.labelToDelete = label
|
||||
this.showDeleteModal = true
|
||||
},
|
||||
|
|
|
@ -153,8 +153,9 @@ import {ALPHABETICAL_SORT} from '@/components/list/partials/filters.vue'
|
|||
|
||||
import draggable from 'zhyswan-vuedraggable'
|
||||
import {calculateItemPosition} from '../../helpers/calculateItemPosition'
|
||||
import type TaskModel from '@/models/task'
|
||||
|
||||
function sortTasks(tasks) {
|
||||
function sortTasks(tasks: TaskModel[]) {
|
||||
if (tasks === null || tasks === []) {
|
||||
return
|
||||
}
|
||||
|
@ -273,7 +274,7 @@ export default defineComponent({
|
|||
focusNewTaskInput() {
|
||||
this.$refs.addTask.focusTaskInput()
|
||||
},
|
||||
updateTaskList( task ) {
|
||||
updateTaskList(task: TaskModel) {
|
||||
if ( this.isAlphabeticalSorting ) {
|
||||
// reload tasks with current filter and sorting
|
||||
this.loadTasks(1, undefined, undefined, true)
|
||||
|
@ -287,11 +288,11 @@ export default defineComponent({
|
|||
|
||||
this.$store.commit(HAS_TASKS, true)
|
||||
},
|
||||
editTask(id) {
|
||||
editTask(id: TaskModel['id']) {
|
||||
this.taskEditTask = {...this.tasks.find(t => t.id === parseInt(id))}
|
||||
this.isTaskEdit = true
|
||||
},
|
||||
updateTasks(updatedTask) {
|
||||
updateTasks(updatedTask: TaskModel) {
|
||||
for (const t in this.tasks) {
|
||||
if (this.tasks[t].id === updatedTask.id) {
|
||||
this.tasks[t] = updatedTask
|
||||
|
|
|
@ -453,6 +453,7 @@ import {uploadFile} from '@/helpers/attachments'
|
|||
import ChecklistSummary from '../../components/tasks/partials/checklist-summary.vue'
|
||||
import CreatedUpdated from '@/components/tasks/partials/createdUpdated.vue'
|
||||
import { setTitle } from '@/helpers/setTitle'
|
||||
import type ListModel from '@/models/list'
|
||||
|
||||
function scrollIntoView(el) {
|
||||
if (!el) {
|
||||
|
@ -592,7 +593,7 @@ export default defineComponent({
|
|||
return uploadFile(this.taskId, ...args)
|
||||
},
|
||||
|
||||
async loadTask(taskId) {
|
||||
async loadTask(taskId: TaskModel['id']) {
|
||||
if (taskId === undefined) {
|
||||
return
|
||||
}
|
||||
|
@ -698,7 +699,7 @@ export default defineComponent({
|
|||
this.saveTask(true, this.toggleTaskDone)
|
||||
},
|
||||
|
||||
async changeList(list) {
|
||||
async changeList(list: ListModel) {
|
||||
this.$store.commit('kanban/removeTaskInBucket', this.task)
|
||||
this.task.listId = list.id
|
||||
await this.saveTask()
|
||||
|
|
|
@ -257,7 +257,7 @@ async function addUser() {
|
|||
success({message: t('team.edit.userAddedSuccess')})
|
||||
}
|
||||
|
||||
async function toggleUserType(member) {
|
||||
async function toggleUserType(member: TeamMemberModel) {
|
||||
// FIXME: direct manipulation
|
||||
member.admin = !member.admin
|
||||
member.teamId = teamId.value
|
||||
|
|
Loading…
Reference in a new issue