Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
81 changes: 33 additions & 48 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
"@nextcloud/browserslist-config": "^3.0.1",
"@nextcloud/e2e-test-server": "^0.2.1",
"@nextcloud/eslint-config": "^8.4.2",
"@nextcloud/prettier-config": "^1.1.0",
"@nextcloud/prettier-config": "^1.2.0",
"@nextcloud/stylelint-config": "^3.1.0",
"@nextcloud/vite-config": "^1.5.3",
"@playwright/test": "^1.53.1",
Expand Down
4 changes: 2 additions & 2 deletions playwright/support/sections/FormSection.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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/'),
Expand Down
4 changes: 2 additions & 2 deletions src/components/Questions/QuestionDate.vue
Original file line number Diff line number Diff line change
Expand Up @@ -242,8 +242,8 @@ export default {
*/
disabledDates(date) {
return (
(this.dateMin && date < this.dateMin) ||
(this.dateMax && date > this.dateMax)
(this.dateMin && date < this.dateMin)
|| (this.dateMax && date > this.dateMax)
)
},

Expand Down
8 changes: 4 additions & 4 deletions src/components/Questions/QuestionFile.vue
Original file line number Diff line number Diff line change
Expand Up @@ -240,8 +240,8 @@ export default {
})

this.maxFileSizeValue =
this.extraSettings.maxFileSize /
FILE_SIZE_UNITS[this.maxFileSizeUnit]
this.extraSettings.maxFileSize
/ FILE_SIZE_UNITS[this.maxFileSizeUnit]
}
},

Expand All @@ -259,8 +259,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(
Expand Down
4 changes: 2 additions & 2 deletions src/components/Questions/QuestionMultiple.vue
Original file line number Diff line number Diff line change
Expand Up @@ -436,8 +436,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(
Expand Down
12 changes: 6 additions & 6 deletions src/components/Questions/QuestionShort.vue
Original file line number Diff line number Diff line change
Expand Up @@ -107,13 +107,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
)
},
/**
Expand Down Expand Up @@ -157,8 +157,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),
)
Expand Down
10 changes: 5 additions & 5 deletions src/components/Results/ResultsSummary.vue
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ export default {
answersModels.unshift({
id: 0,
text:
noResponseCount +
' (' +
noResponsePercentage +
'%): ' +
t('forms', 'No response'),
noResponseCount
+ ' ('
+ noResponsePercentage
+ '%): '
+ t('forms', 'No response'),
})

return answersModels
Expand Down
4 changes: 2 additions & 2 deletions src/components/SidebarTabs/SettingsSidebarTab.vue
Original file line number Diff line number Diff line change
Expand Up @@ -180,8 +180,8 @@ export default {
*/
hasCustomSubmissionMessage() {
return (
this.form?.submissionMessage !== undefined &&
this.form?.submissionMessage !== null
this.form?.submissionMessage !== undefined
&& this.form?.submissionMessage !== null
)
},

Expand Down
8 changes: 4 additions & 4 deletions src/components/SidebarTabs/SharingSearchDiv.vue
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ export default {
(item) =>
!this.currentShares.find(
(share) =>
share.shareWith === item.shareWith &&
share.shareType === item.shareType,
share.shareWith === item.shareWith
&& share.shareType === item.shareType,
),
)
}
Expand All @@ -71,8 +71,8 @@ export default {
(item) =>
!this.currentShares.find(
(share) =>
share.shareWith === item.shareWith &&
share.shareType === item.shareType,
share.shareWith === item.shareWith
&& share.shareType === item.shareType,
),
)
},
Expand Down
8 changes: 4 additions & 4 deletions src/components/TopBar.vue
Original file line number Diff line number Diff line change
Expand Up @@ -119,8 +119,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() {
Expand All @@ -134,8 +134,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)
)
},
},
Expand Down
14 changes: 8 additions & 6 deletions src/mixins/ShareLinkMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,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}`)
)
},

Expand All @@ -45,8 +45,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,
)
)
},

Expand Down
10 changes: 5 additions & 5 deletions src/mixins/UserSearchMixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,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
)
},
/**
Expand Down Expand Up @@ -186,8 +186,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
}
Expand Down
Loading
Loading