Merge pull request #10821 from nextcloud/feat/noid/upgrade-dialogs-to…

…-5-beta

feat(deps): Bump @nextcloud/dialogs to 5.0.0-beta

jest.config.js

@@ -25,6 +25,7 @@ const { resolve } = require('node:path')
 // Listed packages will be transformed with babel-jest
 // TODO: find a way to consolidate this in one place, with webpack.common.js
 const ignorePatterns = [
+	'@mdi/svg',
 	'bail',
 	'comma-separated-tokens',
 	'decode-named-character-reference',
@@ -76,6 +77,7 @@ module.exports = {
 
 	moduleNameMapper: {
 		'\\.(css|scss)$': 'jest-transform-stub',
+		'^.+\\.svg(\\?raw)?$': '<rootDir>/src/__mocks__/svg.js',
 		'vendor/tflite/(.*).wasm$': '<rootDir>/src/utils/media/effects/virtual-background/vendor/tflite/$1.js',
 	},
 

package.json

@@ -27,7 +27,7 @@
     "@nextcloud/axios": "^2.4.0",
     "@nextcloud/browser-storage": "^0.3.0",
     "@nextcloud/capabilities": "^1.1.0",
-    "@nextcloud/dialogs": "^4.2.1",
+    "@nextcloud/dialogs": "^5.0.0-beta.6",
     "@nextcloud/event-bus": "^3.1.0",
     "@nextcloud/files": "^3.0.0-beta.26",
     "@nextcloud/initial-state": "^2.1.0",

src/App.vue

@@ -67,9 +67,6 @@ import { EventBus } from './services/EventBus.js'
 import { leaveConversationSync } from './services/participantsService.js'
 import { signalingKill } from './utils/webrtc/index.js'
 
-// Styles
-import '@nextcloud/dialogs/dist/index.css'
-
 export default {
 	name: 'App',
 	components: {

src/FilesSidebarCallViewApp.vue

@@ -42,9 +42,6 @@ import participant from './mixins/participant.js'
 import sessionIssueHandler from './mixins/sessionIssueHandler.js'
 import talkHashCheck from './mixins/talkHashCheck.js'
 
-// Styles
-import '@nextcloud/dialogs/dist/index.css'
-
 export default {
 
 	name: 'FilesSidebarCallViewApp',

src/FilesSidebarTabApp.vue

@@ -62,9 +62,6 @@ import {
 import CancelableRequest from './utils/cancelableRequest.js'
 import { signalingKill } from './utils/webrtc/index.js'
 
-// Styles
-import '@nextcloud/dialogs/dist/index.css'
-
 export default {
 
 	name: 'FilesSidebarTabApp',

src/PublicShareAuthRequestPasswordButton.vue

@@ -44,9 +44,6 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import browserCheck from './mixins/browserCheck.js'
 import { getPublicShareAuthConversationToken } from './services/publicShareAuthService.js'
 
-// Styles
-import '@nextcloud/dialogs/dist/index.css'
-
 export default {
 
 	name: 'PublicShareAuthRequestPasswordButton',

src/PublicShareSidebar.vue

@@ -79,9 +79,6 @@ import {
 } from './services/participantsService.js'
 import { signalingKill } from './utils/webrtc/index.js'
 
-// Styles
-import '@nextcloud/dialogs/dist/index.css'
-
 export default {
 
 	name: 'PublicShareSidebar',

src/__mocks__/svg.js

@@ -0,0 +1,22 @@
+/**
+ * @copyright Copyright (c) 2023 John Molakvoæ <[email protected]>
+ *
+ * @author John Molakvoæ <[email protected]>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+export default '<svg>SvgMock</svg>'

src/components/ConversationSettings/ConversationAvatarEditor.vue

@@ -142,7 +142,6 @@ const VALID_MIME_TYPES = ['image/png', 'image/jpeg']
 const picker = getFilePickerBuilder(t('spreed', 'Choose your conversation picture'))
 	.setMultiSelect(false)
 	.setMimeTypeFilter(VALID_MIME_TYPES)
-	.setModal(true)
 	.setType(1)
 	.allowDirectories(false)
 	.build()

src/components/MediaSettings/VideoBackgroundEditor.vue

@@ -183,7 +183,6 @@ export default {
 			// Create picker
 			picker = getFilePickerBuilder(t('spreed', 'File to share'))
 				.setMultiSelect(false)
-				.setModal(true)
 				.startAt(relativeBackgroundsFolderPath)
 				.setType(1)
 				.allowDirectories(false)

src/components/NewMessage/NewMessage.vue

@@ -183,7 +183,6 @@ import { isDarkTheme } from '../../utils/isDarkTheme.js'
 
 const picker = getFilePickerBuilder(t('spreed', 'File to share'))
 	.setMultiSelect(false)
-	.setModal(true)
 	.setType(1)
 	.allowDirectories()
 	.build()

src/components/NewMessage/NewMessageAttachments.vue

@@ -85,7 +85,6 @@ import { shareFile } from '../../services/filesSharingServices.js'
 
 const picker = getFilePickerBuilder(t('spreed', 'File to share'))
 	.setMultiSelect(false)
-	.setModal(true)
 	.setType(1)
 	.allowDirectories()
 	.build()

src/components/SettingsDialog/SettingsDialog.vue

@@ -272,7 +272,6 @@ export default {
 		selectAttachmentFolder() {
 			const picker = getFilePickerBuilder(t('spreed', 'Select location for attachments'))
 				.setMultiSelect(false)
-				.setModal(true)
 				.setType(1)
 				.addMimeTypeFilter('httpd/unix-directory')
 				.allowDirectories()

src/main.js

@@ -45,7 +45,6 @@ import './init.js'
 import router from './router/router.js'
 import store from './store/index.js'
 
-import '@nextcloud/dialogs/dist/index.css'
 // Leaflet icon patch
 import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 import 'leaflet/dist/leaflet.css'

src/mainAdminSettings.js

@@ -24,9 +24,6 @@ import Vue from 'vue'
 
 import AdminSettings from './views/AdminSettings.vue'
 
-// Styles
-import '@nextcloud/dialogs/dist/index.css'
-
 Vue.prototype.t = t
 Vue.prototype.n = n
 Vue.prototype.OC = OC

src/mainFilesSidebar.js

@@ -41,7 +41,6 @@ import FilesSidebarTabApp from './FilesSidebarTabApp.vue'
 import './init.js'
 import store from './store/index.js'
 
-import '@nextcloud/dialogs/dist/index.css'
 // Leaflet icon patch
 import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 import 'leaflet/dist/leaflet.css'

src/mainPublicShareAuthSidebar.js

@@ -35,7 +35,6 @@ import PublicShareAuthSidebar from './PublicShareAuthSidebar.vue'
 import './init.js'
 import store from './store/index.js'
 
-import '@nextcloud/dialogs/dist/index.css'
 // Leaflet icon patch
 import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 import 'leaflet/dist/leaflet.css'

src/mainPublicShareSidebar.js

@@ -35,7 +35,6 @@ import PublicShareSidebarTrigger from './PublicShareSidebarTrigger.vue'
 import './init.js'
 import store from './store/index.js'
 
-import '@nextcloud/dialogs/dist/index.css'
 // Leaflet icon patch
 import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 import 'leaflet/dist/leaflet.css'

src/mainRecording.js

@@ -49,7 +49,6 @@ import {
 	signalingKill,
 } from './utils/webrtc/index.js'
 
-import '@nextcloud/dialogs/dist/index.css'
 // Leaflet icon patch
 import 'leaflet-defaulticon-compatibility/dist/leaflet-defaulticon-compatibility.webpack.css' // Re-uses images from ~leaflet package
 import 'leaflet/dist/leaflet.css'