Merge pull request #7060 from nextcloud/upgrade/mail-nc/vue6beta3

Upgrade to nc/vue6beta3
nextcloud · Aug 23, 2022 · 8ad3ac3 · 8ad3ac3
2 parents eb5d6ed + cdc9ce5
commit 8ad3ac3
Show file tree

Hide file tree

Showing 40 changed files with 316 additions and 247 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -42,7 +42,7 @@
     "@nextcloud/logger": "^2.2.1",
     "@nextcloud/moment": "^1.2.1",
     "@nextcloud/router": "^2.0.0",
-    "@nextcloud/vue": "^5.3.1",
+    "@nextcloud/vue": "^6.0.0-beta.3",
     "@nextcloud/vue-dashboard": "^2",
     "@riophae/vue-treeselect": "^0.4.0",
     "@vue/babel-preset-app": "^5.0.8",

diff --git a/src/components/AccountSettings.vue b/src/components/AccountSettings.vue
@@ -105,8 +105,8 @@ import EditorSettings from '../components/EditorSettings'
 import AccountDefaultsSettings from '../components/AccountDefaultsSettings'
 import SignatureSettings from '../components/SignatureSettings'
 import AliasSettings from '../components/AliasSettings'
-import AppSettingsDialog from '@nextcloud/vue/dist/Components/AppSettingsDialog'
-import AppSettingsSection from '@nextcloud/vue/dist/Components/AppSettingsSection'
+import AppSettingsDialog from '@nextcloud/vue/dist/Components/NcAppSettingsDialog'
+import AppSettingsSection from '@nextcloud/vue/dist/Components/NcAppSettingsSection'
 import TrustedSenders from './TrustedSenders'
 import SieveAccountForm from './SieveAccountForm'
 import SieveFilterForm from './SieveFilterForm'

diff --git a/src/components/AppSettingsMenu.vue b/src/components/AppSettingsMenu.vue
@@ -95,7 +95,7 @@
 <script>
 import { generateUrl } from '@nextcloud/router'
 import { showError } from '@nextcloud/dialogs'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import Button from '@nextcloud/vue/dist/Components/NcButton'
 
 import IconInfo from 'vue-material-design-icons/Information'
 import IconEmail from 'vue-material-design-icons/Email'

diff --git a/src/components/AttachmentImageViewer.vue b/src/components/AttachmentImageViewer.vue
@@ -9,7 +9,7 @@
 </template>
 
 <script>
-import Modal from '@nextcloud/vue/dist/Components/Modal'
+import Modal from '@nextcloud/vue/dist/Components/NcModal'
 export default {
 	name: 'AttachmentImageViewer',
 	components: {

diff --git a/src/components/Avatar.vue b/src/components/Avatar.vue
@@ -33,7 +33,7 @@
 </template>
 
 <script>
-import BaseAvatar from '@nextcloud/vue/dist/Components/Avatar'
+import BaseAvatar from '@nextcloud/vue/dist/Components/NcAvatar'
 import { fetchAvatarUrlMemoized } from '../service/AvatarService'
 import logger from '../logger'
 

diff --git a/src/components/Composer.vue b/src/components/Composer.vue
@@ -408,23 +408,23 @@ import isArray from 'lodash/fp/isArray'
 import trimStart from 'lodash/fp/trimCharsStart'
 import Autosize from 'vue-autosize'
 import debouncePromise from 'debounce-promise'
-import Actions from '@nextcloud/vue/dist/Components/Actions'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
-import ActionCheckbox from '@nextcloud/vue/dist/Components/ActionCheckbox'
-import ActionInput from '@nextcloud/vue/dist/Components/ActionInput'
-import ActionRadio from '@nextcloud/vue/dist/Components/ActionRadio'
-import Button from '@nextcloud/vue/dist/Components/Button'
+import Actions from '@nextcloud/vue/dist/Components/NcActions'
+import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import ActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox'
+import ActionInput from '@nextcloud/vue/dist/Components/NcActionInput'
+import ActionRadio from '@nextcloud/vue/dist/Components/NcActionRadio'
+import Button from '@nextcloud/vue/dist/Components/NcButton'
 import ChevronLeft from 'vue-material-design-icons/ChevronLeft'
 import Delete from 'vue-material-design-icons/Delete'
 import ComposerAttachments from './ComposerAttachments'
 import Download from 'vue-material-design-icons/Download'
-import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
+import EmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
 import IconUpload from 'vue-material-design-icons/Upload'
 import IconFolder from 'vue-material-design-icons/Folder'
 import IconPublic from 'vue-material-design-icons/Link'
 import IconCheck from 'vue-material-design-icons/Check'
-import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
-import ListItemIcon from '@nextcloud/vue/dist/Components/ListItemIcon'
+import Multiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
+import ListItemIcon from '@nextcloud/vue/dist/Components/NcListItemIcon'
 import RecipientListItem from './RecipientListItem'
 import UnfoldMoreHorizontal from 'vue-material-design-icons/UnfoldMoreHorizontal'
 import UnfoldLessHorizontal from 'vue-material-design-icons/UnfoldLessHorizontal'
@@ -1396,9 +1396,6 @@ export default {
 	background-color: transparent;
 	border: none;
 }
-.send-action-radio {
-	padding: 5px 0 5px 0;
-}
 .send-button {
 	display: flex;
 	align-items: center;

diff --git a/src/components/Dashboard.vue b/src/components/Dashboard.vue
@@ -63,7 +63,7 @@ import { generateUrl, imagePath } from '@nextcloud/router'
 import { DashboardWidget, DashboardWidgetItem } from '@nextcloud/vue-dashboard'
 import orderBy from 'lodash/fp/orderBy'
 import prop from 'lodash/fp/prop'
-import EmptyContent from '@nextcloud/vue/dist/Components/EmptyContent'
+import EmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent'
 import IconCheck from 'vue-material-design-icons/Check'
 
 import Avatar from '../components/Avatar'

diff --git a/src/components/Envelope.vue b/src/components/Envelope.vue
@@ -236,8 +236,8 @@
 	</ListItem>
 </template>
 <script>
-import ListItem from '@nextcloud/vue/dist/Components/ListItem'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import ListItem from '@nextcloud/vue/dist/Components/NcListItem'
+import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
 import AlertOctagonIcon from 'vue-material-design-icons/AlertOctagon'
 import Avatar from './Avatar'
 import { calculateAccountColor } from '../util/AccountColor'
@@ -272,7 +272,7 @@ import EventModal from './EventModal'
 import EnvelopePrimaryActions from './EnvelopePrimaryActions'
 import { hiddenTags } from './tags.js'
 import { generateUrl } from '@nextcloud/router'
-import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
+import ActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
 import DownloadIcon from 'vue-material-design-icons/Download'
 
 export default {

diff --git a/src/components/EnvelopeList.vue b/src/components/EnvelopeList.vue
@@ -207,8 +207,8 @@
 </template>
 
 <script>
-import Actions from '@nextcloud/vue/dist/Components/Actions'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import Actions from '@nextcloud/vue/dist/Components/NcActions'
+import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
 import { showError } from '@nextcloud/dialogs'
 import Envelope from './Envelope'
 import IconDelete from 'vue-material-design-icons/Delete'

diff --git a/src/components/EventModal.vue b/src/components/EventModal.vue
@@ -60,11 +60,11 @@
 
 <script>
 import { createEvent, getTimezoneManager, DateTimeValue, TextProperty } from '@nextcloud/calendar-js'
-import DatetimePicker from '@nextcloud/vue/dist/Components/DatetimePicker'
+import DatetimePicker from '@nextcloud/vue/dist/Components/NcDatetimePicker'
 import jstz from 'jstz'
-import Modal from '@nextcloud/vue/dist/Components/Modal'
+import Modal from '@nextcloud/vue/dist/Components/NcModal'
 
-import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
+import Multiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
 import { getUserCalendars, importCalendarEvent } from '../service/DAVService'
 import logger from '../logger'
 import CalendarPickerOption from './CalendarPickerOption'

diff --git a/src/components/Imip.vue b/src/components/Imip.vue
@@ -64,8 +64,8 @@
 
 <script>
 import EventData from './imip/EventData'
-// import Button from '@nextcloud/vue/dist/Components/Button'
-// import Actions from '@nextcloud/vue/dist/Components/Actions'
+// import Button from '@nextcloud/vue/dist/Components/NcButton'
+// import Actions from '@nextcloud/vue/dist/Components/NcActions'
 import CloseIcon from 'vue-material-design-icons/Close'
 import CalendarIcon from 'vue-material-design-icons/Calendar'
 import { getParserManager } from '@nextcloud/calendar-js'

diff --git a/src/components/MailboxPicker.vue b/src/components/MailboxPicker.vue
@@ -58,7 +58,7 @@
 	</Modal>
 </template>
 <script>
-import Modal from '@nextcloud/vue/dist/Components/Modal'
+import Modal from '@nextcloud/vue/dist/Components/NcModal'
 import IconBreadcrumb from 'vue-material-design-icons/ChevronRight'
 import IconInbox from 'vue-material-design-icons/Home'
 import IconDraft from 'vue-material-design-icons/Pencil'

diff --git a/src/components/MailboxThread.vue b/src/components/MailboxThread.vue
@@ -65,10 +65,10 @@
 </template>
 
 <script>
-import AppContent from '@nextcloud/vue/dist/Components/AppContent'
-import AppContentList from '@nextcloud/vue/dist/Components/AppContentList'
-import Button from '@nextcloud/vue/dist/Components/Button'
-import Popover from '@nextcloud/vue/dist/Components/Popover'
+import AppContent from '@nextcloud/vue/dist/Components/NcAppContent'
+import AppContentList from '@nextcloud/vue/dist/Components/NcAppContentList'
+import Button from '@nextcloud/vue/dist/Components/NcButton'
+import Popover from '@nextcloud/vue/dist/Components/NcPopover'
 import isMobile from '@nextcloud/vue/dist/Mixins/isMobile'
 import SectionTitle from './SectionTitle'
 import NewMessageButtonHeader from './NewMessageButtonHeader'

diff --git a/src/components/MenuEnvelope.vue b/src/components/MenuEnvelope.vue
@@ -195,9 +195,9 @@
 
 <script>
 import axios from '@nextcloud/axios'
-import Actions from '@nextcloud/vue/dist/Components/Actions'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
-import ActionLink from '@nextcloud/vue/dist/Components/ActionLink'
+import Actions from '@nextcloud/vue/dist/Components/NcActions'
+import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import ActionLink from '@nextcloud/vue/dist/Components/NcActionLink'
 import AlertOctagonIcon from 'vue-material-design-icons/AlertOctagon'
 import { Base64 } from 'js-base64'
 import { buildRecipients as buildReplyRecipients } from '../ReplyBuilder'
@@ -210,7 +210,7 @@ import EventModal from './EventModal'
 import { generateUrl } from '@nextcloud/router'
 import InformationIcon from 'vue-material-design-icons/Information'
 import ImportantIcon from './icons/ImportantIcon'
-import Modal from '@nextcloud/vue/dist/Components/Modal'
+import Modal from '@nextcloud/vue/dist/Components/NcModal'
 import MoveModal from './MoveModal'
 import OpenInNewIcon from 'vue-material-design-icons/OpenInNew'
 import PlusIcon from 'vue-material-design-icons/Plus'

diff --git a/src/components/MessageAttachment.vue b/src/components/MessageAttachment.vue
@@ -67,9 +67,9 @@ import { formatFileSize } from '@nextcloud/files'
 import { translate as t } from '@nextcloud/l10n'
 import { getFilePickerBuilder } from '@nextcloud/dialogs'
 import { mixin as onClickOutside } from 'vue-on-click-outside'
-import PopoverMenu from '@nextcloud/vue/dist/Components/PopoverMenu'
-import Actions from '@nextcloud/vue/dist/Components/Actions'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import PopoverMenu from '@nextcloud/vue/dist/Components/NcPopoverMenu'
+import Actions from '@nextcloud/vue/dist/Components/NcActions'
+import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
 
 import Logger from '../logger'
 

diff --git a/src/components/MessageHTMLBody.vue b/src/components/MessageHTMLBody.vue
@@ -43,8 +43,8 @@
 import { iframeResizer } from 'iframe-resizer'
 import PrintScout from 'printscout'
 import { trustSender } from '../service/TrustedSenderService'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
-import Actions from '@nextcloud/vue/dist/Components/Actions'
+import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import Actions from '@nextcloud/vue/dist/Components/NcActions'
 import IconImage from 'vue-material-design-icons/ImageSizeSelectActual'
 import IconMail from 'vue-material-design-icons/Email'
 import IconDomain from 'vue-material-design-icons/Domain'

diff --git a/src/components/Navigation.vue b/src/components/Navigation.vue
@@ -78,11 +78,11 @@
 </template>
 
 <script>
-import AppNavigation from '@nextcloud/vue/dist/Components/AppNavigation'
+import AppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation'
 import AppNavigationSettings
-	from '@nextcloud/vue/dist/Components/AppNavigationSettings'
+	from '@nextcloud/vue/dist/Components/NcAppNavigationSettings'
 import AppNavigationSpacer
-	from '@nextcloud/vue/dist/Components/AppNavigationSpacer'
+	from '@nextcloud/vue/dist/Components/NcAppNavigationSpacer'
 
 import NavigationAccount from './NavigationAccount'
 import NavigationAccountExpandCollapse from './NavigationAccountExpandCollapse'

diff --git a/src/components/NavigationAccount.vue b/src/components/NavigationAccount.vue
@@ -105,11 +105,11 @@
 </template>
 
 <script>
-import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
-import ActionCheckbox from '@nextcloud/vue/dist/Components/ActionCheckbox'
-import ActionInput from '@nextcloud/vue/dist/Components/ActionInput'
-import ActionText from '@nextcloud/vue/dist/Components/ActionText'
+import AppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
+import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import ActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox'
+import ActionInput from '@nextcloud/vue/dist/Components/NcActionInput'
+import ActionText from '@nextcloud/vue/dist/Components/NcActionText'
 import { formatFileSize } from '@nextcloud/files'
 import { generateUrl } from '@nextcloud/router'
 

diff --git a/src/components/NavigationAccountExpandCollapse.vue b/src/components/NavigationAccountExpandCollapse.vue
@@ -24,7 +24,7 @@
 </template>
 
 <script>
-import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
+import AppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
 import logger from '../logger'
 
 export default {

diff --git a/src/components/NavigationMailbox.vue b/src/components/NavigationMailbox.vue
@@ -196,12 +196,12 @@
 </template>
 
 <script>
-import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
-import AppNavigationCounter from '@nextcloud/vue/dist/Components/AppNavigationCounter'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
-import ActionCheckbox from '@nextcloud/vue/dist/Components/ActionCheckbox'
-import ActionInput from '@nextcloud/vue/dist/Components/ActionInput'
-import ActionText from '@nextcloud/vue/dist/Components/ActionText'
+import AppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
+import AppNavigationCounter from '@nextcloud/vue/dist/Components/NcAppNavigationCounter'
+import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
+import ActionCheckbox from '@nextcloud/vue/dist/Components/NcActionCheckbox'
+import ActionInput from '@nextcloud/vue/dist/Components/NcActionInput'
+import ActionText from '@nextcloud/vue/dist/Components/NcActionText'
 import IconEmailCheck from 'vue-material-design-icons/EmailCheck'
 import IconExternal from 'vue-material-design-icons/OpenInNew'
 import IconFolder from 'vue-material-design-icons/Folder'

diff --git a/src/components/NavigationOutbox.vue b/src/components/NavigationOutbox.vue
@@ -40,8 +40,8 @@
 </template>
 
 <script>
-import AppNavigationItem from '@nextcloud/vue/dist/Components/AppNavigationItem'
-import CounterBubble from '@nextcloud/vue/dist/Components/CounterBubble'
+import AppNavigationItem from '@nextcloud/vue/dist/Components/NcAppNavigationItem'
+import CounterBubble from '@nextcloud/vue/dist/Components/NcCounterBubble'
 import IconOutbox from 'vue-material-design-icons/InboxArrowUp'
 
 export default {

diff --git a/src/components/NewMessageButtonHeader.vue b/src/components/NewMessageButtonHeader.vue
@@ -27,7 +27,7 @@
 </template>
 
 <script>
-import Button from '@nextcloud/vue/dist/Components/Button'
+import Button from '@nextcloud/vue/dist/Components/NcButton'
 import IconAdd from 'vue-material-design-icons/Plus'
 import IconRefresh from 'vue-material-design-icons/Refresh'
 import logger from '../logger'

diff --git a/src/components/NewMessageModal.vue b/src/components/NewMessageModal.vue
@@ -24,7 +24,7 @@
 	</Modal>
 </template>
 <script>
-import Modal from '@nextcloud/vue/dist/Components/Modal'
+import Modal from '@nextcloud/vue/dist/Components/NcModal'
 import logger from '../logger'
 import { toPlain, toHtml, plain } from '../util/text'
 import { saveDraft } from '../service/MessageService'

diff --git a/src/components/NoMessageSelected.vue b/src/components/NoMessageSelected.vue
@@ -30,7 +30,7 @@
 </template>
 
 <script>
-import AppContentDetails from '@nextcloud/vue/dist/Components/AppContentDetails'
+import AppContentDetails from '@nextcloud/vue/dist/Components/NcAppContentDetails'
 import IconMail from 'vue-material-design-icons/Email'
 
 export default {

diff --git a/src/components/Outbox.vue b/src/components/Outbox.vue
@@ -51,8 +51,8 @@
 </template>
 
 <script>
-import AppContent from '@nextcloud/vue/dist/Components/AppContent'
-import AppContentList from '@nextcloud/vue/dist/Components/AppContentList'
+import AppContent from '@nextcloud/vue/dist/Components/NcAppContent'
+import AppContentList from '@nextcloud/vue/dist/Components/NcAppContentList'
 import Loading from './Loading'
 import Error from './Error'
 import EmptyMailbox from './EmptyMailbox'

diff --git a/src/components/OutboxMessageListItem.vue b/src/components/OutboxMessageListItem.vue
@@ -57,8 +57,8 @@
 </template>
 
 <script>
-import ListItem from '@nextcloud/vue/dist/Components/ListItem'
-import ActionButton from '@nextcloud/vue/dist/Components/ActionButton'
+import ListItem from '@nextcloud/vue/dist/Components/NcListItem'
+import ActionButton from '@nextcloud/vue/dist/Components/NcActionButton'
 import Avatar from './Avatar'
 import IconDelete from 'vue-material-design-icons/Delete'
 import { getLanguage, translate as t } from '@nextcloud/l10n'

diff --git a/src/components/RecipientBubble.vue b/src/components/RecipientBubble.vue
@@ -88,9 +88,9 @@
 
 <script>
 import { generateUrl } from '@nextcloud/router'
-import UserBubble from '@nextcloud/vue/dist/Components/UserBubble'
-import Popover from '@nextcloud/vue/dist/Components/Popover'
-import Multiselect from '@nextcloud/vue/dist/Components/Multiselect'
+import UserBubble from '@nextcloud/vue/dist/Components/NcUserBubble'
+import Popover from '@nextcloud/vue/dist/Components/NcPopover'
+import Multiselect from '@nextcloud/vue/dist/Components/NcMultiselect'
 
 import { fetchAvatarUrlMemoized } from '../service/AvatarService'
 import { addToContact, findMatches, newContact, autoCompleteByName } from '../service/ContactIntegrationService'