Merge pull request #2692 from nextcloud/chore/stable4/update-deps

Chartman123 · web-flow · commit 1a0855d14a9b · 2025-04-12T16:24:15.000+02:00
[stable4] chore: update deps and adjust code to new prettier rules
diff --git a/composer.lock b/composer.lock
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -58,7 +58,7 @@
     "@nextcloud/browserslist-config": "^3.0.1",
     "@nextcloud/cypress": "^1.0.0-beta.14",
     "@nextcloud/eslint-config": "^8.4.1",
-    "@nextcloud/prettier-config": "^1.1.0",
+    "@nextcloud/prettier-config": "^1.2.0",
     "@nextcloud/stylelint-config": "^3.0.1",
     "@nextcloud/vite-config": "^1.5.3",
     "@playwright/test": "^1.51.1",
diff --git a/playwright/support/sections/FormSection.ts b/playwright/support/sections/FormSection.ts
@@ -56,8 +56,8 @@ export class FormSection {
 	private getFormUpdatedPromise(): Promise<Response> {
 		return this.page.waitForResponse(
 			(response) =>
-				response.request().method() === 'PATCH' &&
-				response
+				response.request().method() === 'PATCH'
+				&& response
 					.request()
 					.url()
 					.includes('/ocs/v2.php/apps/forms/api/v3/forms/'),
diff --git a/src/components/Questions/QuestionFile.vue b/src/components/Questions/QuestionFile.vue
@@ -257,8 +257,8 @@ export default {
 			})
 
 			this.maxFileSizeValue =
-				this.extraSettings.maxFileSize /
-				FILE_SIZE_UNITS[this.maxFileSizeUnit]
+				this.extraSettings.maxFileSize
+				/ FILE_SIZE_UNITS[this.maxFileSizeUnit]
 		}
 	},
 
@@ -276,8 +276,8 @@ export default {
 				formData.append('files[]', file)
 
 				if (
-					this.extraSettings.maxFileSize > 0 &&
-					file.size > this.extraSettings.maxFileSize
+					this.extraSettings.maxFileSize > 0
+					&& file.size > this.extraSettings.maxFileSize
 				) {
 					showError(
 						t(
diff --git a/src/components/Questions/QuestionMultiple.vue b/src/components/Questions/QuestionMultiple.vue
@@ -465,8 +465,8 @@ export default {
 				this.onExtraSettingsChange({ optionsLimitMin: undefined })
 			} else if (min) {
 				if (
-					this.extraSettings.optionsLimitMax &&
-					min > this.extraSettings.optionsLimitMax
+					this.extraSettings.optionsLimitMax
+					&& min > this.extraSettings.optionsLimitMax
 				) {
 					showError(
 						t(
diff --git a/src/components/Questions/QuestionShort.vue b/src/components/Questions/QuestionShort.vue
@@ -122,13 +122,13 @@ export default {
 		submissionInputPlaceholder() {
 			if (!this.readOnly) {
 				return (
-					this.validationObject.createPlaceholder ||
-					this.answerType.createPlaceholder
+					this.validationObject.createPlaceholder
+					|| this.answerType.createPlaceholder
 				)
 			}
 			return (
-				this.validationObject.submitPlaceholder ||
-				this.answerType.submitPlaceholder
+				this.validationObject.submitPlaceholder
+				|| this.answerType.submitPlaceholder
 			)
 		},
 		/**
@@ -172,8 +172,8 @@ export default {
 				// If the browsers validation succeeds either the browser does not implement a validation
 				// or it is valid, so we double check by running our custom validation.
 				if (
-					!input.checkValidity() ||
-					!this.validationObject.validate(
+					!input.checkValidity()
+					|| !this.validationObject.validate(
 						value,
 						splitRegex(this.validationRegex),
 					)
diff --git a/src/components/Results/ResultsSummary.vue b/src/components/Results/ResultsSummary.vue
@@ -221,11 +221,11 @@ export default {
 			answersModels.unshift({
 				id: 0,
 				text:
-					noResponseCount +
-					' (' +
-					noResponsePercentage +
-					'%): ' +
-					t('forms', 'No response'),
+					noResponseCount
+					+ ' ('
+					+ noResponsePercentage
+					+ '%): '
+					+ t('forms', 'No response'),
 			})
 
 			return answersModels
diff --git a/src/components/SidebarTabs/SettingsSidebarTab.vue b/src/components/SidebarTabs/SettingsSidebarTab.vue
@@ -199,8 +199,8 @@ export default {
 		 */
 		hasCustomSubmissionMessage() {
 			return (
-				this.form?.submissionMessage !== undefined &&
-				this.form?.submissionMessage !== null
+				this.form?.submissionMessage !== undefined
+				&& this.form?.submissionMessage !== null
 			)
 		},
 
@@ -209,9 +209,9 @@ export default {
 		 */
 		disableSubmitMultiple() {
 			return (
-				this.hasPublicLink ||
-				this.form.access.legacyLink ||
-				this.form.isAnonymous
+				this.hasPublicLink
+				|| this.form.access.legacyLink
+				|| this.form.isAnonymous
 			)
 		},
 		disableSubmitMultipleExplanation() {
diff --git a/src/components/SidebarTabs/SharingSearchDiv.vue b/src/components/SidebarTabs/SharingSearchDiv.vue
@@ -79,8 +79,8 @@ export default {
 					(item) =>
 						!this.currentShares.find(
 							(share) =>
-								share.shareWith === item.shareWith &&
-								share.shareType === item.shareType,
+								share.shareWith === item.shareWith
+								&& share.shareType === item.shareType,
 						),
 				)
 			}
@@ -89,8 +89,8 @@ export default {
 				(item) =>
 					!this.currentShares.find(
 						(share) =>
-							share.shareWith === item.shareWith &&
-							share.shareType === item.shareType,
+							share.shareWith === item.shareWith
+							&& share.shareType === item.shareType,
 					),
 			)
 		},
diff --git a/src/components/TopBar.vue b/src/components/TopBar.vue
@@ -136,8 +136,8 @@ export default {
 		},
 		canEdit() {
 			return (
-				this.permissions.includes(this.PERMISSION_TYPES.PERMISSION_EDIT) &&
-				!this.archived
+				this.permissions.includes(this.PERMISSION_TYPES.PERMISSION_EDIT)
+				&& !this.archived
 			)
 		},
 		canSeeResults() {
@@ -151,8 +151,8 @@ export default {
 		},
 		canOnlySubmit() {
 			return (
-				this.permissions.length === 1 &&
-				this.permissions.includes(this.PERMISSION_TYPES.PERMISSION_SUBMIT)
+				this.permissions.length === 1
+				&& this.permissions.includes(this.PERMISSION_TYPES.PERMISSION_SUBMIT)
 			)
 		},
 	},
diff --git a/src/mixins/ShareLinkMixin.js b/src/mixins/ShareLinkMixin.js
@@ -33,10 +33,10 @@ export default {
 		 */
 		getInternalShareLink(formHash) {
 			return (
-				window.location.protocol +
-				'//' +
-				window.location.host +
-				generateUrl(`/apps/forms/${this.form.hash}`)
+				window.location.protocol
+				+ '//'
+				+ window.location.host
+				+ generateUrl(`/apps/forms/${this.form.hash}`)
 			)
 		},
 
@@ -62,8 +62,10 @@ export default {
 		 */
 		isEmbeddingAllowed(share) {
 			return (
-				share.shareType === this.SHARE_TYPES.SHARE_TYPE_LINK &&
-				share.permissions?.includes(this.PERMISSION_TYPES.PERMISSION_EMBED)
+				share.shareType === this.SHARE_TYPES.SHARE_TYPE_LINK
+				&& share.permissions?.includes(
+					this.PERMISSION_TYPES.PERMISSION_EMBED,
+				)
 			)
 		},
 
diff --git a/src/mixins/UserSearchMixin.js b/src/mixins/UserSearchMixin.js
@@ -54,9 +54,9 @@ export default {
 		 */
 		isValidQuery() {
 			return (
-				this.query &&
-				this.query.trim() !== '' &&
-				this.query.length > this.minSearchStringLength
+				this.query
+				&& this.query.trim() !== ''
+				&& this.query.length > this.minSearchStringLength
 			)
 		},
 		/**
@@ -204,8 +204,8 @@ export default {
 				try {
 					// filter out current user
 					if (
-						share.value.shareType === this.SHARE_TYPES.SHARE_TYPE_USER &&
-						share.value.shareWith === getCurrentUser().uid
+						share.value.shareType === this.SHARE_TYPES.SHARE_TYPE_USER
+						&& share.value.shareWith === getCurrentUser().uid
 					) {
 						return false
 					}
diff --git a/src/mixins/ViewsMixin.js b/src/mixins/ViewsMixin.js
@@ -85,8 +85,8 @@ export default {
 		formDescription() {
 			// Remember the old renderer if overridden, or proxy to the default renderer.
 			const defaultRender =
-				this.markdownit.renderer.rules.link_open ||
-				function (tokens, idx, options, env, self) {
+				this.markdownit.renderer.rules.link_open
+				|| function (tokens, idx, options, env, self) {
 					return self.renderToken(tokens, idx, options)
 				}
 
@@ -105,8 +105,8 @@ export default {
 			}
 
 			return (
-				this.markdownit.render(this.form.description) ||
-				this.form.description
+				this.markdownit.render(this.form.description)
+				|| this.form.description
 			)
 		},
 	},
diff --git a/src/views/Create.vue b/src/views/Create.vue
@@ -290,8 +290,8 @@ export default {
 
 			if (this.isRequiredUsed) {
 				message +=
-					' ' +
-					t('forms', 'An asterisk (*) indicates mandatory questions.')
+					' '
+					+ t('forms', 'An asterisk (*) indicates mandatory questions.')
 			}
 
 			return message
diff --git a/src/views/Results.vue b/src/views/Results.vue
@@ -522,11 +522,11 @@ export default {
 			const exportUrl =
 				generateOcsUrl('apps/forms/api/v3/forms/{id}/submissions', {
 					id: this.form.id,
-				}) +
-				'?requesttoken=' +
-				encodeURIComponent(getRequestToken()) +
-				'&fileFormat=' +
-				fileFormat
+				})
+				+ '?requesttoken='
+				+ encodeURIComponent(getRequestToken())
+				+ '&fileFormat='
+				+ fileFormat
 			window.open(exportUrl, '_self')
 		},
 
@@ -703,9 +703,9 @@ export default {
 				questions
 					.filter(
 						(question) =>
-							(question.type === 'date') |
-							(question.type === 'datetime') |
-							(question.type === 'time'),
+							(question.type === 'date')
+							| (question.type === 'datetime')
+							| (question.type === 'time'),
 					)
 					.map((question) => [question.id, question.type]),
 			)
diff --git a/src/views/Submit.vue b/src/views/Submit.vue
@@ -349,8 +349,8 @@ export default {
 			}
 			if (this.isRequiredUsed) {
 				message +=
-					' ' +
-					t('forms', 'An asterisk (*) indicates mandatory questions.')
+					' '
+					+ t('forms', 'An asterisk (*) indicates mandatory questions.')
 			}
 
 			return message
@@ -361,8 +361,8 @@ export default {
 		 */
 		submissionMessageHTML() {
 			if (
-				this.form.submissionMessage &&
-				(this.success || !this.form.canSubmit)
+				this.form.submissionMessage
+				&& (this.success || !this.form.canSubmit)
 			) {
 				return this.markdownit.render(this.form.submissionMessage)
 			}
@@ -606,8 +606,8 @@ export default {
 
 				// in case no answer is set or all are empty show the confirmation dialog
 				if (
-					Object.keys(this.answers).length === 0 ||
-					Object.values(this.answers).every(
+					Object.keys(this.answers).length === 0
+					|| Object.values(this.answers).every(
 						(answers) => answers.length === 0,
 					)
 				) {
diff --git a/vendor-bin/cs-fixer/composer.lock b/vendor-bin/cs-fixer/composer.lock
diff --git a/vendor-bin/openapi-extractor/composer.json b/vendor-bin/openapi-extractor/composer.json
diff --git a/vendor-bin/openapi-extractor/composer.lock b/vendor-bin/openapi-extractor/composer.lock
diff --git a/vendor-bin/psalm/composer.lock b/vendor-bin/psalm/composer.lock
