Update makefile and format:fix

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:

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
 	},

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,
 		})
 	},
 }

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,21 +27,19 @@ const appSettings = {
 			method: 'POST',
 			url: 'settings/app',
 			data: { appSettings },
-			signal:
-				cancelTokenHandlerObject[
-					this.writeAppSettings.name
-				].handleRequestCancellation().signal,
+			signal: cancelTokenHandlerObject[
+				this.writeAppSettings.name
+			].handleRequestCancellation().signal,
 		})
 	},
 
 	getGroups(query: string): Promise<AxiosResponse<{ groups: Group[] }>> {
 		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,
 		})
 	},
 }

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(

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<AxiosResponse<{ comment: Comment }>> {
@@ -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,
 		})
 	},
 }

src/Api/modules/options.ts

@@ -7,18 +7,22 @@ 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<AxiosResponse<{ options: OptionDto[] }>> {
 		return httpInstance.request({
 			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,21 +101,19 @@ const options = {
 				pollId,
 				text: optionsBatch,
 			},
-			signal:
-				cancelTokenHandlerObject[
-					this.addOptions.name
-				].handleRequestCancellation().signal,
+			signal: cancelTokenHandlerObject[
+				this.addOptions.name
+			].handleRequestCancellation().signal,
 		})
 	},
 
 	confirmOption(optionId: number): Promise<AxiosResponse<{ option: OptionDto }>> {
 		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,
 		})
 	},
 }

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,
 		})
 	},
 }