Merge pull request #2523 from nextcloud/dependabot/npm_and_yarn/nextcloud/vue-7.0.1

package.json

@@ -32,7 +32,7 @@
 		"@nextcloud/l10n": "^1.6.0",
 		"@nextcloud/moment": "^1.2.1",
 		"@nextcloud/router": "^2.0.0",
-		"@nextcloud/vue": "^5.4.0",
+		"@nextcloud/vue": "^7.1.0-beta.0",
 		"vue": "^2.7.14"
 	},
 	"browserslist": [

src/components/AdminSettings.vue

@@ -171,7 +171,7 @@
 							{{ t('richdocuments', 'Loading available demo servers …') }}
 						</p>
 						<p v-else-if="demoServers.length > 0">
-							<Multiselect v-if="serverMode === 'demo'"
+							<NcMultiselect v-if="serverMode === 'demo'"
 								v-model="settings.demoUrl"
 								:custom-label="demoServerLabel"
 								track-by="demo_url"
@@ -201,7 +201,7 @@
 			</fieldset>
 		</div>
 
-		<Modal v-if="serverMode === 'demo' && !approvedDemoModal" @close="serverMode = 'custom'">
+		<NcModal v-if="serverMode === 'demo' && !approvedDemoModal" @close="serverMode = 'custom'">
 			<div class="modal__content">
 				<p>{{ t('richdocuments', 'Please make sure you understand that the following will happen if you set up the Collabora Online demo.') }}</p>
 				<ul>
@@ -218,7 +218,7 @@
 					@click="approvedDemoModal=true">
 				<input type="button" :value="t('richdocuments', 'I will setup my own server')" @click="serverMode = 'custom'">
 			</div>
-		</Modal>
+		</NcModal>
 
 		<div v-if="isSetup" id="advanced-settings" class="section">
 			<h2>{{ t('richdocuments', 'Advanced settings') }}</h2>
@@ -398,7 +398,7 @@ import Vue from 'vue'
 import { loadState } from '@nextcloud/initial-state'
 import { generateUrl, generateFilePath } from '@nextcloud/router'
 import { showWarning, showError } from '@nextcloud/dialogs'
-import { Modal, Multiselect } from '@nextcloud/vue'
+import { NcModal, NcMultiselect } from '@nextcloud/vue'
 import axios from '@nextcloud/axios'
 import SettingsCheckbox from './SettingsCheckbox.vue'
 import SettingsInputText from './SettingsInputText.vue'
@@ -427,11 +427,11 @@ export default {
 		SettingsInputText,
 		SettingsSelectTag,
 		SettingsSelectGroup,
-		Multiselect,
+		NcMultiselect,
 		SettingsExternalApps,
 		SettingsInputFile,
 		SettingsFontList,
-		Modal,
+		NcModal,
 	},
 	props: {
 		initial: {

src/components/SettingsSelectGroup.vue

@@ -21,7 +21,7 @@
   -->
 
 <template>
-	<Multiselect v-model="inputValObjects"
+	<NcMultiselect v-model="inputValObjects"
 		:options="groupsArray"
 		:options-limit="5"
 		:placeholder="label"
@@ -35,19 +35,19 @@
 		@input="update"
 		@search-change="asyncFindGroup">
 		<span slot="noResult">{{ t('settings', 'No results') }}</span>
-	</Multiselect>
+	</NcMultiselect>
 </template>
 
 <script>
 import axios from '@nextcloud/axios'
-import { Multiselect } from '@nextcloud/vue'
+import { NcMultiselect } from '@nextcloud/vue'
 import { generateOcsUrl } from '@nextcloud/router'
 
 let uuid = 0
 export default {
 	name: 'SettingsSelectGroup',
 	components: {
-		Multiselect,
+		NcMultiselect,
 	},
 	props: {
 		label: {

src/components/SettingsSelectTag.vue

@@ -21,7 +21,7 @@
   -->
 
 <template>
-	<Multiselect v-model="inputValObjects"
+	<NcMultiselect v-model="inputValObjects"
 		:options="tags"
 		:options-limit="5"
 		:placeholder="label"
@@ -38,14 +38,14 @@
 		<template #option="scope">
 			{{ tagLabel(scope.option) }}
 		</template>
-	</Multiselect>
+	</NcMultiselect>
 </template>
 
 <script>
 import axios from '@nextcloud/axios'
 
 import { generateRemoteUrl } from '@nextcloud/router'
-import { Multiselect } from '@nextcloud/vue'
+import { NcMultiselect } from '@nextcloud/vue'
 
 const xmlToJson = (xml) => {
 	let obj = {}
@@ -135,7 +135,7 @@ let uuid = 0
 export default {
 	name: 'SettingsSelectTag',
 	components: {
-		Multiselect,
+		NcMultiselect,
 	},
 	props: {
 		label: {

src/view/Office.vue

@@ -26,15 +26,15 @@
 			<div v-if="showLoadingIndicator"
 				id="office-viewer__loading-overlay"
 				:class="{ debug: debug }">
-				<EmptyContent v-if="!error" icon="icon-loading">
+				<NcEmptyContent v-if="!error" icon="icon-loading">
 					{{ t('richdocuments', 'Loading {filename} …', { filename: basename }, 1, {escape: false}) }}
 					<template #desc>
 						<button @click="close">
 							{{ t('richdocuments', 'Cancel') }}
 						</button>
 					</template>
-				</EmptyContent>
-				<EmptyContent v-else icon="icon-error">
+				</NcEmptyContent>
+				<NcEmptyContent v-else icon="icon-error">
 					{{ t('richdocuments', 'Document loading failed') }}
 					<template #desc>
 						{{ errorMessage }}<br><br>
@@ -42,11 +42,11 @@
 							{{ t('richdocuments', 'Close') }}
 						</button>
 					</template>
-				</EmptyContent>
+				</NcEmptyContent>
 			</div>
 			<div v-show="!useNativeHeader && showIframe" class="office-viewer__header">
 				<div class="avatars">
-					<Avatar v-for="view in avatarViews"
+					<NcAvatar v-for="view in avatarViews"
 						:key="view.ViewId"
 						:user="view.UserId"
 						:display-name="view.UserName"
@@ -54,9 +54,9 @@
 						:show-user-status-compact="false"
 						:style="viewColor(view)" />
 				</div>
-				<Actions>
-					<ActionButton icon="office-viewer__header__icon-menu-sidebar" @click="share" />
-				</Actions>
+				<NcActions>
+					<NcActionButton icon="office-viewer__header__icon-menu-sidebar" @click="share" />
+				</NcActions>
 			</div>
 			<iframe id="collaboraframe"
 				ref="documentFrame"
@@ -68,7 +68,7 @@
 </template>
 
 <script>
-import { Avatar, Actions, ActionButton, EmptyContent } from '@nextcloud/vue'
+import { NcAvatar, NcActions, NcActionButton, NcEmptyContent } from '@nextcloud/vue'
 import { loadState } from '@nextcloud/initial-state'
 
 import { basename, dirname } from 'path'
@@ -92,10 +92,10 @@ const LOADING_STATE = {
 export default {
 	name: 'Office',
 	components: {
-		Avatar,
-		Actions,
-		ActionButton,
-		EmptyContent,
+		NcAvatar,
+		NcActions,
+		NcActionButton,
+		NcEmptyContent,
 	},
 	props: {
 		filename: {