diff --git a/Makefile b/Makefile index 040131f809..8fa1273845 100644 --- a/Makefile +++ b/Makefile @@ -54,12 +54,15 @@ clean-dev: clean lint: npm run lint npm run stylelint + npm run format composer run cs:check + composer run psalm # lint fix js, css and php lint-fix: npm run lint:fix npm run stylelint:fix + npm run format composer run cs:fix cs: diff --git a/src/Api/modules/activity.ts b/src/Api/modules/activity.ts index 8983973b1e..d9290e5bf1 100644 --- a/src/Api/modules/activity.ts +++ b/src/Api/modules/activity.ts @@ -16,10 +16,9 @@ const activity = { object_type: 'poll', object_id: pollId, }, - signal: - cancelTokenHandlerObject[ - this.getActivities.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getActivities.name + ].handleRequestCancellation().signal, }) return response }, diff --git a/src/Api/modules/admin.ts b/src/Api/modules/admin.ts index b097150f54..e2d7aed5bc 100644 --- a/src/Api/modules/admin.ts +++ b/src/Api/modules/admin.ts @@ -12,10 +12,9 @@ const adminJobs = { return httpInstance.request({ method: 'GET', url: 'administration/jobs', - signal: - cancelTokenHandlerObject[ - this.getJobsList.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getJobsList.name + ].handleRequestCancellation().signal, }) }, @@ -27,10 +26,9 @@ const adminJobs = { job: job.className, }, - signal: - cancelTokenHandlerObject[ - this.runJob.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.runJob.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/Api/modules/appSettings.ts b/src/Api/modules/appSettings.ts index efc53b0b56..225f81f58b 100644 --- a/src/Api/modules/appSettings.ts +++ b/src/Api/modules/appSettings.ts @@ -14,10 +14,9 @@ const appSettings = { method: 'GET', url: 'settings/app', params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getAppSettings.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getAppSettings.name + ].handleRequestCancellation().signal, }) }, @@ -28,10 +27,9 @@ const appSettings = { method: 'POST', url: 'settings/app', data: { appSettings }, - signal: - cancelTokenHandlerObject[ - this.writeAppSettings.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.writeAppSettings.name + ].handleRequestCancellation().signal, }) }, @@ -39,10 +37,9 @@ const appSettings = { return httpInstance.request({ method: 'GET', url: `groups${query.trim() ? `/${query.trim()}` : ''}`, - signal: - cancelTokenHandlerObject[ - this.getGroups.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getGroups.name + ].handleRequestCancellation().signal, }) }, @@ -54,10 +51,9 @@ const appSettings = { method: 'GET', url: `search/users${query.trim() ? `/${query.trim()}` : ''}`, params: { types: types.toString() }, - signal: - cancelTokenHandlerObject[ - this.getUsers.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getUsers.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/Api/modules/calendar.ts b/src/Api/modules/calendar.ts index c6129f9635..49b4080207 100644 --- a/src/Api/modules/calendar.ts +++ b/src/Api/modules/calendar.ts @@ -14,10 +14,9 @@ const calendar = { method: 'GET', url: 'calendars', params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getCalendars.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getCalendars.name + ].handleRequestCancellation().signal, }) }, getEvents( diff --git a/src/Api/modules/comments.ts b/src/Api/modules/comments.ts index 4da673ffc9..17c132c72a 100644 --- a/src/Api/modules/comments.ts +++ b/src/Api/modules/comments.ts @@ -13,10 +13,9 @@ const comments = { method: 'GET', url: `poll/${pollId}/comments`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getComments.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getComments.name + ].handleRequestCancellation().signal, }) }, addComment( @@ -29,10 +28,9 @@ const comments = { url: `poll/${pollId}/comment`, data: { message, confidential }, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.addComment.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.addComment.name + ].handleRequestCancellation().signal, }) }, @@ -42,10 +40,9 @@ const comments = { url: `comment/${commentId}`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.deleteComment.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.deleteComment.name + ].handleRequestCancellation().signal, }) }, restoreComment(commentId: number): Promise> { @@ -54,10 +51,9 @@ const comments = { url: `comment/${commentId}/restore`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.restoreComment.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.restoreComment.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/Api/modules/options.ts b/src/Api/modules/options.ts index 2a3f44460e..06cd7d11c7 100644 --- a/src/Api/modules/options.ts +++ b/src/Api/modules/options.ts @@ -7,7 +7,12 @@ import { httpInstance, createCancelTokenHandler } from './HttpApi' import type { DateTimeUnits } from '../../Types/dateTime' import type { AxiosResponse } from '@nextcloud/axios' import type { Vote } from '../../stores/votes.types' -import type { Option, OptionDto, Sequence, SimpleOption } from '../../stores/options.types' +import type { + Option, + OptionDto, + Sequence, + SimpleOption, +} from '../../stores/options.types' const options = { getOptions(pollId: number): Promise> { @@ -15,10 +20,9 @@ const options = { method: 'GET', url: `poll/${pollId}/options`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getOptions.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getOptions.name + ].handleRequestCancellation().signal, }) }, @@ -39,10 +43,9 @@ const options = { url: `poll/${pollId}/option`, // data: { ...option }, data: { option, sequence, voteYes }, - signal: - cancelTokenHandlerObject[ - this.addOption.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.addOption.name + ].handleRequestCancellation().signal, }) }, @@ -51,10 +54,9 @@ const options = { method: 'PUT', url: `option/${option.id}`, data: { ...option }, - signal: - cancelTokenHandlerObject[ - this.updateOption.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.updateOption.name + ].handleRequestCancellation().signal, }) }, @@ -63,10 +65,9 @@ const options = { method: 'DELETE', url: `option/${optionId}`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.deleteOption.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.deleteOption.name + ].handleRequestCancellation().signal, }) }, @@ -76,10 +77,9 @@ const options = { url: `option/${optionId}/restore`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.restoreOption.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.restoreOption.name + ].handleRequestCancellation().signal, }) }, @@ -101,10 +101,9 @@ const options = { pollId, text: optionsBatch, }, - signal: - cancelTokenHandlerObject[ - this.addOptions.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.addOptions.name + ].handleRequestCancellation().signal, }) }, @@ -112,10 +111,9 @@ const options = { return httpInstance.request({ method: 'PUT', url: `option/${optionId}/confirm`, - signal: - cancelTokenHandlerObject[ - this.confirmOption.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.confirmOption.name + ].handleRequestCancellation().signal, }) }, @@ -130,10 +128,9 @@ const options = { method: 'POST', url: `poll/${pollId}/options/reorder`, data: { options }, - signal: - cancelTokenHandlerObject[ - this.reorderOptions.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.reorderOptions.name + ].handleRequestCancellation().signal, }) }, @@ -147,10 +144,9 @@ const options = { data: { sequence, }, - signal: - cancelTokenHandlerObject[ - this.addOptionsSequence.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.addOptionsSequence.name + ].handleRequestCancellation().signal, }) }, @@ -166,10 +162,9 @@ const options = { step, unit, }, - signal: - cancelTokenHandlerObject[ - this.shiftOptions.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.shiftOptions.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/Api/modules/pollGroups.ts b/src/Api/modules/pollGroups.ts index f68193985b..66391ce9b8 100644 --- a/src/Api/modules/pollGroups.ts +++ b/src/Api/modules/pollGroups.ts @@ -14,10 +14,9 @@ const pollGroups = { method: 'GET', url: 'pollgroups', params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getPollGroups.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getPollGroups.name + ].handleRequestCancellation().signal, }) }, @@ -46,10 +45,9 @@ const pollGroups = { method: verb, url, data, - signal: - cancelTokenHandlerObject[ - this.addPollToGroup.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.addPollToGroup.name + ].handleRequestCancellation().signal, }) }, @@ -60,10 +58,9 @@ const pollGroups = { return httpInstance.request({ method: 'DELETE', url: `pollgroup/${pollGroupId}/poll/${pollId}`, - signal: - cancelTokenHandlerObject[ - this.removePollFromGroup.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.removePollFromGroup.name + ].handleRequestCancellation().signal, }) }, @@ -81,10 +78,9 @@ const pollGroups = { titleExt: payload.titleExt, description: payload.description, }, - signal: - cancelTokenHandlerObject[ - this.updatePollGroup.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.updatePollGroup.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/Api/modules/polls.ts b/src/Api/modules/polls.ts index 21b9d6ba5a..b36ea6f7d9 100644 --- a/src/Api/modules/polls.ts +++ b/src/Api/modules/polls.ts @@ -31,10 +31,9 @@ const polls = { method: 'GET', url: 'polls', params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getPolls.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getPolls.name + ].handleRequestCancellation().signal, }) }, @@ -43,10 +42,9 @@ const polls = { method: 'GET', url: `poll/${pollId}/poll`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getPoll.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getPoll.name + ].handleRequestCancellation().signal, }) }, @@ -55,10 +53,9 @@ const polls = { method: 'GET', url: `poll/${pollId}`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getPoll.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getPoll.name + ].handleRequestCancellation().signal, }) }, @@ -66,10 +63,9 @@ const polls = { return httpInstance.request({ method: 'PUT', url: `administration/poll/${pollId}/takeover`, - signal: - cancelTokenHandlerObject[ - this.takeOver.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.takeOver.name + ].handleRequestCancellation().signal, }) }, @@ -80,10 +76,9 @@ const polls = { return httpInstance.request({ method: 'PUT', url: `poll/${pollId}/changeowner/${userId}`, - signal: - cancelTokenHandlerObject[ - this.changeOwner.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.changeOwner.name + ].handleRequestCancellation().signal, }) }, @@ -92,10 +87,9 @@ const polls = { method: 'POST', url: 'poll/add', data: payload, - signal: - cancelTokenHandlerObject[ - this.addPoll.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.addPoll.name + ].handleRequestCancellation().signal, }) }, @@ -113,10 +107,9 @@ const polls = { method: 'PUT', url: `poll/${pollId}`, data: { poll }, - signal: - cancelTokenHandlerObject[ - this.writePoll.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.writePoll.name + ].handleRequestCancellation().signal, }) }, @@ -124,10 +117,9 @@ const polls = { return httpInstance.request({ method: 'PUT', url: `poll/${pollId}/lockAnonymous`, - signal: - cancelTokenHandlerObject[ - this.lockAnonymous.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.lockAnonymous.name + ].handleRequestCancellation().signal, }) }, @@ -135,10 +127,9 @@ const polls = { return httpInstance.request({ method: 'DELETE', url: `poll/${pollId}`, - signal: - cancelTokenHandlerObject[ - this.deletePoll.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.deletePoll.name + ].handleRequestCancellation().signal, }) }, @@ -146,10 +137,9 @@ const polls = { return httpInstance.request({ method: 'PUT', url: `poll/${pollId}/close`, - signal: - cancelTokenHandlerObject[ - this.closePoll.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.closePoll.name + ].handleRequestCancellation().signal, }) }, @@ -157,10 +147,9 @@ const polls = { return httpInstance.request({ method: 'PUT', url: `poll/${pollId}/reopen`, - signal: - cancelTokenHandlerObject[ - this.reopenPoll.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.reopenPoll.name + ].handleRequestCancellation().signal, }) }, @@ -168,10 +157,9 @@ const polls = { return httpInstance.request({ method: 'PUT', url: `poll/${pollId}/toggleArchive`, - signal: - cancelTokenHandlerObject[ - this.toggleArchive.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.toggleArchive.name + ].handleRequestCancellation().signal, }) }, @@ -179,10 +167,9 @@ const polls = { return httpInstance.request({ method: 'POST', url: `poll/${pollId}/clone`, - signal: - cancelTokenHandlerObject[ - this.clonePoll.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.clonePoll.name + ].handleRequestCancellation().signal, }) }, @@ -192,10 +179,9 @@ const polls = { return httpInstance.request({ method: 'POST', url: `poll/${pollId}/confirmation`, - signal: - cancelTokenHandlerObject[ - this.sendConfirmation.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.sendConfirmation.name + ].handleRequestCancellation().signal, }) }, @@ -205,10 +191,9 @@ const polls = { return httpInstance.request({ method: 'GET', url: `poll/${pollId}/addresses`, - signal: - cancelTokenHandlerObject[ - this.getParticipantsEmailAddresses.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getParticipantsEmailAddresses.name + ].handleRequestCancellation().signal, }) }, @@ -218,10 +203,9 @@ const polls = { return httpInstance.request({ method: 'GET', url: `poll/${pollId}/subscription`, - signal: - cancelTokenHandlerObject[ - this.getSubscription.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getSubscription.name + ].handleRequestCancellation().signal, }) }, @@ -232,10 +216,9 @@ const polls = { return httpInstance.request({ method: 'PUT', url: `poll/${pollId}${subscription ? '/subscribe' : '/unsubscribe'}`, - signal: - cancelTokenHandlerObject[ - this.setSubscription.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.setSubscription.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/Api/modules/public.ts b/src/Api/modules/public.ts index 8f3a60e6c7..7c66401a0b 100644 --- a/src/Api/modules/public.ts +++ b/src/Api/modules/public.ts @@ -25,10 +25,9 @@ const publicPoll = { method: 'GET', url: `/s/${shareToken}/poll`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getPoll.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getPoll.name + ].handleRequestCancellation().signal, }) }, @@ -37,22 +36,22 @@ const publicPoll = { method: 'GET', url: `/s/${shareToken}/session`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getSession.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getSession.name + ].handleRequestCancellation().signal, }) }, - getOptions(shareToken: string): Promise> { + getOptions( + shareToken: string, + ): Promise> { return httpInstance.request({ method: 'GET', url: `/s/${shareToken}/options`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getOptions.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getOptions.name + ].handleRequestCancellation().signal, }) }, @@ -66,10 +65,9 @@ const publicPoll = { method: 'POST', url: `/s/${shareToken}/option`, data: { option, sequence, voteYes }, - signal: - cancelTokenHandlerObject[ - this.addOption.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.addOption.name + ].handleRequestCancellation().signal, }) }, @@ -81,10 +79,9 @@ const publicPoll = { method: 'DELETE', url: `s/${shareToken}/option/${optionId}`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.deleteOption.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.deleteOption.name + ].handleRequestCancellation().signal, }) }, @@ -97,10 +94,9 @@ const publicPoll = { url: `s/${shareToken}/option/${optionId}/restore`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.restoreOption.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.restoreOption.name + ].handleRequestCancellation().signal, }) }, @@ -109,10 +105,9 @@ const publicPoll = { method: 'GET', url: `/s/${shareToken}/votes`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getVotes.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getVotes.name + ].handleRequestCancellation().signal, }) }, @@ -128,10 +123,9 @@ const publicPoll = { optionId, setTo, }, - signal: - cancelTokenHandlerObject[ - this.setVote.name - ].handleRequestCancellation(optionId).signal, + signal: cancelTokenHandlerObject[ + this.setVote.name + ].handleRequestCancellation(optionId).signal, }) }, @@ -139,10 +133,9 @@ const publicPoll = { return httpInstance.request({ method: 'DELETE', url: `s/${shareToken}/user`, - signal: - cancelTokenHandlerObject[ - this.resetVotes.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.resetVotes.name + ].handleRequestCancellation().signal, }) }, @@ -152,10 +145,9 @@ const publicPoll = { return httpInstance.request({ method: 'DELETE', url: `s/${shareToken}/votes/orphaned`, - signal: - cancelTokenHandlerObject[ - this.removeOrphanedVotes.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.removeOrphanedVotes.name + ].handleRequestCancellation().signal, }) }, @@ -166,10 +158,9 @@ const publicPoll = { method: 'GET', url: `/s/${shareToken}/comments`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getComments.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getComments.name + ].handleRequestCancellation().signal, }) }, @@ -183,10 +174,9 @@ const publicPoll = { url: `s/${shareToken}/comment`, data: { message, confidential }, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.addComment.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.addComment.name + ].handleRequestCancellation().signal, }) }, @@ -199,10 +189,9 @@ const publicPoll = { url: `s/${shareToken}/comment/${commentId}`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.deleteComment.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.deleteComment.name + ].handleRequestCancellation().signal, }) }, @@ -215,10 +204,9 @@ const publicPoll = { url: `s/${shareToken}/comment/${commentId}/restore`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.restoreComment.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.restoreComment.name + ].handleRequestCancellation().signal, }) }, @@ -227,10 +215,9 @@ const publicPoll = { method: 'GET', url: `s/${shareToken}/share`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getShare.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getShare.name + ].handleRequestCancellation().signal, }) }, @@ -242,10 +229,9 @@ const publicPoll = { method: 'PUT', url: `s/${shareToken}/email/${emailAddress}`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.setEmailAddress.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.setEmailAddress.name + ].handleRequestCancellation().signal, }) }, @@ -256,10 +242,9 @@ const publicPoll = { method: 'DELETE', url: `s/${shareToken}/email`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.deleteEmailAddress.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.deleteEmailAddress.name + ].handleRequestCancellation().signal, }) }, @@ -271,10 +256,9 @@ const publicPoll = { method: 'PUT', url: `s/${shareToken}/name/${displayName}`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.setDisplayName.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.setDisplayName.name + ].handleRequestCancellation().signal, }) }, @@ -285,10 +269,9 @@ const publicPoll = { method: 'POST', url: `s/${shareToken}/resend`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.resendInvitation.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.resendInvitation.name + ].handleRequestCancellation().signal, }) }, @@ -298,10 +281,9 @@ const publicPoll = { return httpInstance.request({ method: 'GET', url: `s/${shareToken}/subscription`, - signal: - cancelTokenHandlerObject[ - this.getSubscription.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getSubscription.name + ].handleRequestCancellation().signal, }) }, @@ -312,10 +294,9 @@ const publicPoll = { return httpInstance.request({ method: 'PUT', url: `s/${shareToken}${subscription ? '/subscribe' : '/unsubscribe'}`, - signal: - cancelTokenHandlerObject[ - this.setSubscription.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.setSubscription.name + ].handleRequestCancellation().signal, }) }, @@ -334,10 +315,9 @@ const publicPoll = { timeZone, }, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.register.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.register.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/Api/modules/session.ts b/src/Api/modules/session.ts index 36b83c3f69..e2759e1701 100644 --- a/src/Api/modules/session.ts +++ b/src/Api/modules/session.ts @@ -13,10 +13,9 @@ const session = { method: 'GET', url: '/session', params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getSession.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getSession.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/Api/modules/shares.ts b/src/Api/modules/shares.ts index de78a7d529..07ed2e9266 100644 --- a/src/Api/modules/shares.ts +++ b/src/Api/modules/shares.ts @@ -27,10 +27,9 @@ const shares = { method: 'GET', url: `${purpose.toLowerCase()}/${pollOrPollGroupId}/shares`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getShares.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getShares.name + ].handleRequestCancellation().signal, }) }, @@ -44,10 +43,9 @@ const shares = { method: 'POST', url: `${purpose.toLowerCase()}/${pollOrPollGroupId}/share`, data: user, - signal: - cancelTokenHandlerObject[ - this.addUserShare.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.addUserShare.name + ].handleRequestCancellation().signal, }) }, @@ -55,10 +53,9 @@ const shares = { return httpInstance.request({ method: 'POST', url: `poll/${pollId}/publicshare`, - signal: - cancelTokenHandlerObject[ - this.addPublicShare.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.addPublicShare.name + ].handleRequestCancellation().signal, }) }, @@ -72,10 +69,9 @@ const shares = { data: { label, }, - signal: - cancelTokenHandlerObject[ - this.writeLabel.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.writeLabel.name + ].handleRequestCancellation().signal, }) }, @@ -86,10 +82,9 @@ const shares = { return httpInstance.request({ method: 'PUT', url: `share/${shareToken}/${setTo}`, - signal: - cancelTokenHandlerObject[ - this.switchAdmin.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.switchAdmin.name + ].handleRequestCancellation().signal, }) }, @@ -100,10 +95,9 @@ const shares = { return httpInstance.request({ method: 'PUT', url: `share/${shareToken}/publicpollemail/${setTo}`, - signal: - cancelTokenHandlerObject[ - this.setEmailAddressConstraint.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.setEmailAddressConstraint.name + ].handleRequestCancellation().signal, }) }, @@ -116,10 +110,9 @@ const shares = { return httpInstance.request({ method: 'POST', url: `share/${shareToken}/invite`, - signal: - cancelTokenHandlerObject[ - this.sendInvitation.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.sendInvitation.name + ].handleRequestCancellation().signal, }) }, @@ -128,10 +121,9 @@ const shares = { method: 'GET', url: `share/${shareToken}/resolve`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.resolveShare.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.resolveShare.name + ].handleRequestCancellation().signal, }) }, @@ -139,10 +131,9 @@ const shares = { return httpInstance.request({ method: 'DELETE', url: `share/${shareToken}`, - signal: - cancelTokenHandlerObject[ - this.deleteShare.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.deleteShare.name + ].handleRequestCancellation().signal, }) }, @@ -150,10 +141,9 @@ const shares = { return httpInstance.request({ method: 'PUT', url: `share/${shareToken}/restore`, - signal: - cancelTokenHandlerObject[ - this.restoreShare.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.restoreShare.name + ].handleRequestCancellation().signal, }) }, @@ -161,10 +151,9 @@ const shares = { return httpInstance.request({ method: 'PUT', url: `share/${shareToken}/lock`, - signal: - cancelTokenHandlerObject[ - this.lockShare.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.lockShare.name + ].handleRequestCancellation().signal, }) }, @@ -172,10 +161,9 @@ const shares = { return httpInstance.request({ method: 'PUT', url: `share/${shareToken}/unlock`, - signal: - cancelTokenHandlerObject[ - this.unlockShare.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.unlockShare.name + ].handleRequestCancellation().signal, }) }, @@ -185,10 +173,9 @@ const shares = { return httpInstance.request({ method: 'PUT', url: `poll/${pollId}/inviteAll`, - signal: - cancelTokenHandlerObject[ - this.inviteAll.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.inviteAll.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/Api/modules/userSettings.ts b/src/Api/modules/userSettings.ts index 8aeef05e5e..36b8d7a690 100644 --- a/src/Api/modules/userSettings.ts +++ b/src/Api/modules/userSettings.ts @@ -13,10 +13,9 @@ const userSettings = { method: 'GET', url: 'preferences', params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getUserSettings.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getUserSettings.name + ].handleRequestCancellation().signal, }) }, @@ -27,10 +26,9 @@ const userSettings = { method: 'POST', url: 'preferences', data: { preferences }, - signal: - cancelTokenHandlerObject[ - this.writeUserSettings.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.writeUserSettings.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/Api/modules/validators.ts b/src/Api/modules/validators.ts index b38e859601..332171941d 100644 --- a/src/Api/modules/validators.ts +++ b/src/Api/modules/validators.ts @@ -13,10 +13,9 @@ const validators = { return httpInstance.request({ method: 'GET', url: `check/emailaddress/${emailAddress}`, - signal: - cancelTokenHandlerObject[ - this.validateEmailAddress.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.validateEmailAddress.name + ].handleRequestCancellation().signal, }) }, @@ -27,10 +26,9 @@ const validators = { return httpInstance.request({ method: 'POST', url: 'check/username', - signal: - cancelTokenHandlerObject[ - this.validateName.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.validateName.name + ].handleRequestCancellation().signal, data: { displayName: name, token: pollToken, diff --git a/src/Api/modules/votes.ts b/src/Api/modules/votes.ts index e1f15b3204..7d9c108b0a 100644 --- a/src/Api/modules/votes.ts +++ b/src/Api/modules/votes.ts @@ -14,10 +14,9 @@ const votes = { method: 'GET', url: `poll/${pollId}/votes`, params: { time: +new Date() }, - signal: - cancelTokenHandlerObject[ - this.getVotes.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.getVotes.name + ].handleRequestCancellation().signal, }) }, @@ -32,10 +31,9 @@ const votes = { optionId, setTo, }, - signal: - cancelTokenHandlerObject[ - this.setVote.name - ].handleRequestCancellation(optionId).signal, + signal: cancelTokenHandlerObject[ + this.setVote.name + ].handleRequestCancellation(optionId).signal, }) }, @@ -46,10 +44,9 @@ const votes = { return httpInstance.request({ method: 'DELETE', url: userId ? `poll/${pollId}/user/${userId}` : `poll/${pollId}/user`, - signal: - cancelTokenHandlerObject[ - this.resetVotes.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.resetVotes.name + ].handleRequestCancellation().signal, }) }, @@ -59,10 +56,9 @@ const votes = { return httpInstance.request({ method: 'DELETE', url: `poll/${pollId}/votes/orphaned`, - signal: - cancelTokenHandlerObject[ - this.removeOrphanedVotes.name - ].handleRequestCancellation().signal, + signal: cancelTokenHandlerObject[ + this.removeOrphanedVotes.name + ].handleRequestCancellation().signal, }) }, } diff --git a/src/App.vue b/src/App.vue index 2f7825f950..e2f071d76e 100644 --- a/src/App.vue +++ b/src/App.vue @@ -107,9 +107,13 @@ function onTransitionsOn() { transitionsOn() } -watch(() => sessionStore.windowTitle, (title) => { - document.title = title -}, { immediate: true }) +watch( + () => sessionStore.windowTitle, + (title) => { + document.title = title + }, + { immediate: true }, +) onMounted(() => { subscribe(Event.TransitionsOff, onTransitionsOff) diff --git a/src/components/Configuration/ConfigDangerArea.vue b/src/components/Configuration/ConfigDangerArea.vue index 5d187d9316..4eeb48b30c 100644 --- a/src/components/Configuration/ConfigDangerArea.vue +++ b/src/components/Configuration/ConfigDangerArea.vue @@ -32,7 +32,7 @@ function toggleArchive() { showError( pollStore.status.isArchived ? t('polls', 'Error restoring poll.') - : t('polls', 'Error archiving poll.'), + : t('polls', 'Error archiving poll.'), ) } } diff --git a/src/components/PollList/PollItem.vue b/src/components/PollList/PollItem.vue index 088b0f1c2c..ca0c1cb1aa 100644 --- a/src/components/PollList/PollItem.vue +++ b/src/components/PollList/PollItem.vue @@ -132,7 +132,6 @@ const pollDetails = computed(() => { const descriptionLine = computed( () => poll.configuration.description || pollDetails.value.description, ) -