Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to nextcloud-vue 8 (beta) #39540

Merged
merged 8 commits into from
Aug 2, 2023
Merged

Update to nextcloud-vue 8 (beta) #39540

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
663db2b
chore: Update nextcloud-vue to v8 beta2 and renamed changed properties
susnux Jul 23, 2023
4c306a3
fix: Resolve code linting issues
susnux Jul 23, 2023
ee18e43
fix(cypress): Make sure cypress can preprocess files corrently (this …
susnux Jul 23, 2023
5eb2a5d
fix(dav): Update jest snapshot for changed vue sidebar tab
susnux Jul 23, 2023
fab9f48
chore: Build assets
susnux Jul 23, 2023
e457572
fix: Acceptance tests adjusted to find new style sidebar tabs
susnux Jul 24, 2023
9bf42fc
fix(jest): also mock initial-state
skjnldsv Aug 2, 2023
6503125
fix(cypress): Really mock the initial state instead of trying to stub…
susnux Aug 2, 2023
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
8 changes: 5 additions & 3 deletions dist/core-maintenance.js.LICENSE.txt → __mocks__/@nextcloud/initial-state.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
/**
* @copyright 2019 Christoph Wurst <christoph@winzerhof-wurst.at>
* @copyright Copyright (c) 2023 John Molakvoæ <skjnldsv@protonmail.com>
*
* @author Christoph Wurst <christoph@winzerhof-wurst.at>
* @author John Molakvoæ <skjnldsv@protonmail.com>
* @author Roeland Jago Douma <roeland@famdouma.nl>
*
* @license AGPL-3.0-or-later
*
Expand All @@ -21,3 +19,7 @@
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
*/

export const loadState = function(app: string, key: string, fallback?: any) {
return fallback
}
3 changes: 2 additions & 1 deletion apps/comments/src/components/Comment.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,13 @@

<!-- Message content -->
<!-- The html is escaped and sanitized before rendering -->
<!-- eslint-disable-next-line vue/no-v-html-->
<!-- eslint-disable vue/no-v-html-->
<div v-else
:class="{'comment__message--expanded': expanded}"
class="comment__message"
@click="onExpand"
v-html="renderedContent" />
<!-- eslint-enable vue/no-v-html-->
</div>
</component>
</template>
Expand Down
14 changes: 7 additions & 7 deletions apps/comments/src/views/Comments.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,9 @@
-->

<template>
<div class="comments"
:class="{ 'icon-loading': isFirstLoading }"
v-observe-visibility="onVisibilityChange">
<div v-observe-visibility="onVisibilityChange"
class="comments"
:class="{ 'icon-loading': isFirstLoading }">
<!-- Editor -->
<Comment v-bind="editorData"
:auto-complete="autoComplete"
Expand All @@ -37,7 +37,7 @@
<template v-if="!isFirstLoading">
<NcEmptyContent v-if="!hasComments && done"
class="comments__empty"
:title="t('comments', 'No comments yet, start the conversation!')">
:name="t('comments', 'No comments yet, start the conversation!')">
<template #icon>
<MessageReplyTextIcon />
</template>
Expand Down Expand Up @@ -65,7 +65,7 @@

<!-- Error message -->
<template v-else-if="error">
<NcEmptyContent class="comments__error" :title="error">
<NcEmptyContent class="comments__error" :name="error">
<template #icon>
<AlertCircleOutlineIcon />
</template>
Expand All @@ -87,7 +87,7 @@
import { loadState } from '@nextcloud/initial-state'
import { showError } from '@nextcloud/dialogs'
import axios from '@nextcloud/axios'
import VTooltip from 'v-tooltip'

Check warning on line 90 in apps/comments/src/views/Comments.vue

View workflow job for this annotation

GitHub Actions / eslint 

Using exported name 'VTooltip' as identifier for default export
import Vue from 'vue'
import VueObserveVisibility from 'vue-observe-visibility'

Expand Down Expand Up @@ -191,8 +191,8 @@
/**
* Make sure we have all mentions as Array of objects
*
* @param {Array} mentions the mentions list
* @return {Object<string, object>}
* @param {any[]} mentions the mentions list
* @return {Record<string, object>}
*/
genMentionsData(mentions) {
Object.values(mentions)
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/src/views/Availability.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<NcSettingsSection :title="$t('dav', 'Availability')"
<NcSettingsSection :name="$t('dav', 'Availability')"
:description="$t('dav', 'If you configure your working hours, other users will see when you are out of office when they book a meeting.')">
<div class="time-zone">
<strong>
Expand Down
2 changes: 1 addition & 1 deletion apps/dav/src/views/CalDavSettings.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<template>
<NcSettingsSection :title="$t('dav', 'Calendar server')"
<NcSettingsSection :name="$t('dav', 'Calendar server')"
:doc-url="userSyncCalendarsDocUrl">
<!-- Can use v-html as:
- $t passes the translated string through DOMPurify.sanitize,
Expand Down
Loading
Loading