chore(eslint): enable import/order rule back

.eslintrc.js

@@ -15,7 +15,7 @@ module.exports = {
 		'import/newline-after-import': 'warn',
 		'import/no-named-as-default-member': 'off',
 		'import/order': [
-			'off', // TODO disabled with #10622 as it breaks tests and changes many components
+			'warn',
 			{
 				groups: ['builtin', 'external', 'internal', ['parent', 'sibling', 'index'], 'unknown'],
 				pathGroups: [
@@ -48,8 +48,8 @@ module.exports = {
 						// group project components
 						pattern: '*.vue',
 						patternOptions: { matchBase: true },
-						group: 'external',
-						position: 'after',
+						group: 'parent',
+						position: 'before',
 					},
 				],
 				pathGroupsExcludedImportTypes: ['@nextcloud', 'vue-material-design-icons'],

src/PublicShareAuthRequestPasswordButton.vue

@@ -40,6 +40,7 @@
 
 <script>
 import { Fragment } from 'vue-frag'
+
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import { getPublicShareAuthConversationToken } from './services/publicShareAuthService.js'

src/components/AdminSettings/RecordingServers.vue

@@ -104,9 +104,10 @@ import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
 
 import RecordingServer from '../../components/AdminSettings/RecordingServer.vue'
-import { CALL } from '../../constants.js'
 import TransitionWrapper from '../TransitionWrapper.vue'
 
+import { CALL } from '../../constants.js'
+
 const recordingConsentCapability = getCapabilities()?.spreed?.features?.includes('recording-consent')
 const recordingConsentOptions = [
 	{ value: CALL.RECORDING_CONSENT.OFF, label: t('spreed', 'Disabled for all calls') },

src/components/BreakoutRoomsEditor/BreakoutRoomsParticipantsEditor.vue

@@ -115,8 +115,8 @@ import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
 
-import BreakoutRoomItem from '../RightSidebar/BreakoutRooms/BreakoutRoomItem.vue'
 import SelectableParticipant from './SelectableParticipant.vue'
+import BreakoutRoomItem from '../RightSidebar/BreakoutRooms/BreakoutRoomItem.vue'
 
 import { ATTENDEE, CONVERSATION, PARTICIPANT } from '../../constants.js'
 

src/components/CallView/CallView.vue

@@ -176,12 +176,14 @@
 <script>
 import debounce from 'debounce'
 
+import AccountBox from 'vue-material-design-icons/AccountBoxOutline.vue'
+
 import { getCapabilities } from '@nextcloud/capabilities'
 import { showMessage } from '@nextcloud/dialogs'
 import { subscribe, unsubscribe } from '@nextcloud/event-bus'
 import { loadState } from '@nextcloud/initial-state'
 
-import AccountBox from 'vue-material-design-icons/AccountBoxOutline.vue'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import Grid from './Grid/Grid.vue'
 import EmptyCallView from './shared/EmptyCallView.vue'
@@ -197,7 +199,6 @@ import BrowserStorage from '../../services/BrowserStorage.js'
 import { fetchPeers } from '../../services/callsService.js'
 import { EventBus } from '../../services/EventBus.js'
 import { localMediaModel, localCallParticipantModel, callParticipantCollection } from '../../utils/webrtc/index.js'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import RemoteVideoBlocker from '../../utils/webrtc/RemoteVideoBlocker.js'
 
 export default {

src/components/CallView/shared/LocalVideo.vue

@@ -71,13 +71,13 @@ import { showError, showInfo, TOAST_PERMANENT_TIMEOUT } from '@nextcloud/dialogs
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
-import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 import VideoBackground from './VideoBackground.vue'
+import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 
 import { AVATAR } from '../../../constants.js'
 import video from '../../../mixins/video.js'
-import attachMediaStream from '../../../utils/attachmediastream.js'
 import { useGuestNameStore } from '../../../stores/guestName.js'
+import attachMediaStream from '../../../utils/attachmediastream.js'
 import { ConnectionState } from '../../../utils/webrtc/models/CallParticipantModel.js'
 
 export default {

src/components/CallView/shared/Screen.vue

@@ -40,8 +40,8 @@ import SHA1 from 'crypto-js/sha1.js'
 
 import VideoBottomBar from './VideoBottomBar.vue'
 
-import attachMediaStream from '../../../utils/attachmediastream.js'
 import { useGuestNameStore } from '../../../stores/guestName.js'
+import attachMediaStream from '../../../utils/attachmediastream.js'
 
 export default {
 

src/components/CallView/shared/VideoVue.vue

@@ -92,11 +92,11 @@ import SHA1 from 'crypto-js/sha1.js'
 import AccountCircle from 'vue-material-design-icons/AccountCircle.vue'
 import AccountOff from 'vue-material-design-icons/AccountOff.vue'
 
-import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
-import TransitionWrapper from '../../TransitionWrapper.vue'
 import Screen from './Screen.vue'
 import VideoBackground from './VideoBackground.vue'
 import VideoBottomBar from './VideoBottomBar.vue'
+import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
+import TransitionWrapper from '../../TransitionWrapper.vue'
 
 import { ATTENDEE, AVATAR } from '../../../constants.js'
 import video from '../../../mixins/video.js'

src/components/CallView/shared/ViewerOverlayCallView.vue

@@ -131,13 +131,13 @@ import ChevronUp from 'vue-material-design-icons/ChevronUp.vue'
 
 import { NcButton, Tooltip } from '@nextcloud/vue'
 
-import TransitionWrapper from '../../TransitionWrapper.vue'
 import EmptyCallView from './EmptyCallView.vue'
 import LocalAudioControlButton from './LocalAudioControlButton.vue'
 import LocalVideo from './LocalVideo.vue'
 import LocalVideoControlButton from './LocalVideoControlButton.vue'
-import VideoVue from './VideoVue.vue'
 import Screen from './Screen.vue'
+import VideoVue from './VideoVue.vue'
+import TransitionWrapper from '../../TransitionWrapper.vue'
 
 import { localCallParticipantModel, localMediaModel } from '../../../utils/webrtc/index.js'
 

src/components/ConversationSettings/RecordingConsentSettings.vue

@@ -44,12 +44,12 @@
 </template>
 
 <script>
+import { getCapabilities } from '@nextcloud/capabilities'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 
 import { CALL, CONVERSATION } from '../../constants.js'
-import { getCapabilities } from '@nextcloud/capabilities'
 
 const recordingConsent = getCapabilities()?.spreed?.config?.call?.['recording-consent']
 

src/components/DialpadPanel.vue

@@ -81,16 +81,15 @@
 </template>
 
 <script>
-import { getLocale } from '@nextcloud/l10n'
-
 import BackspaceOutline from 'vue-material-design-icons/BackspaceOutline.vue'
+import Dialpad from 'vue-material-design-icons/Dialpad.vue'
+
+import { getLocale } from '@nextcloud/l10n'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
 import NcSelect from '@nextcloud/vue/dist/Components/NcSelect.js'
 
-import Dialpad from 'vue-material-design-icons/Dialpad.vue'
-
 import { regionCodes } from '../regionCodes.js'
 
 const allowedKeys = /^[0-9+\-()*#\s]+$/

src/components/LeftSidebar/ConversationsList/Conversation.spec.js

@@ -7,9 +7,9 @@ import Vuex from 'vuex'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
-import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
+import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
 
 import Conversation from './Conversation.vue'
 

src/components/LeftSidebar/ConversationsList/Conversation.vue

@@ -147,9 +147,9 @@ import { showError } from '@nextcloud/dialogs'
 import { emit } from '@nextcloud/event-bus'
 
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcDialog from '@nextcloud/vue/dist/Components/NcDialog.js'
 import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
-import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 
 import ConversationIcon from './../../ConversationIcon.vue'
 

src/components/LeftSidebar/ConversationsListVirtual.vue

@@ -37,8 +37,8 @@
 <script>
 import { RecycleScroller } from 'vue-virtual-scroller'
 
-import LoadingPlaceholder from '../LoadingPlaceholder.vue'
 import Conversation from './ConversationsList/Conversation.vue'
+import LoadingPlaceholder from '../LoadingPlaceholder.vue'
 
 import 'vue-virtual-scroller/dist/vue-virtual-scroller.css'
 

src/components/LeftSidebar/LeftSidebar.vue

@@ -276,10 +276,10 @@ import FilterIcon from 'vue-material-design-icons/Filter.vue'
 import FilterRemoveIcon from 'vue-material-design-icons/FilterRemove.vue'
 import List from 'vue-material-design-icons/FormatListBulleted.vue'
 import MessageBadge from 'vue-material-design-icons/MessageBadge.vue'
+import MessageOutline from 'vue-material-design-icons/MessageOutline.vue'
 import Note from 'vue-material-design-icons/NoteEditOutline.vue'
 import Phone from 'vue-material-design-icons/Phone.vue'
 import Plus from 'vue-material-design-icons/Plus.vue'
-import MessageOutline from 'vue-material-design-icons/MessageOutline.vue'
 
 import { getCapabilities } from '@nextcloud/capabilities'
 import { showError } from '@nextcloud/dialogs'
@@ -291,19 +291,19 @@ import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcAppNavigation from '@nextcloud/vue/dist/Components/NcAppNavigation.js'
 import NcAppNavigationCaption from '@nextcloud/vue/dist/Components/NcAppNavigationCaption.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
+import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 import NcListItem from '@nextcloud/vue/dist/Components/NcListItem.js'
 import isMobile from '@nextcloud/vue/dist/Mixins/isMobile.js'
-import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 
-import ConversationIcon from '../ConversationIcon.vue'
-import Hint from '../Hint.vue'
-import TransitionWrapper from '../TransitionWrapper.vue'
 import CallPhoneDialog from './CallPhoneDialog/CallPhoneDialog.vue'
 import Conversation from './ConversationsList/Conversation.vue'
 import ConversationsListVirtual from './ConversationsListVirtual.vue'
 import NewGroupConversation from './NewGroupConversation/NewGroupConversation.vue'
 import OpenConversationsList from './OpenConversationsList/OpenConversationsList.vue'
 import SearchBox from './SearchBox/SearchBox.vue'
+import ConversationIcon from '../ConversationIcon.vue'
+import Hint from '../Hint.vue'
+import TransitionWrapper from '../TransitionWrapper.vue'
 
 import { useArrowNavigation } from '../../composables/useArrowNavigation.js'
 import { CONVERSATION } from '../../constants.js'
@@ -317,8 +317,8 @@ import {
 import { EventBus } from '../../services/EventBus.js'
 import { talkBroadcastChannel } from '../../services/talkBroadcastChannel.js'
 import CancelableRequest from '../../utils/cancelableRequest.js'
-import { requestTabLeadership } from '../../utils/requestTabLeadership.js'
 import { hasUnreadMentions, filterFunction } from '../../utils/conversation.js'
+import { requestTabLeadership } from '../../utils/requestTabLeadership.js'
 
 const canModerateSipDialOut = getCapabilities()?.spreed?.features?.includes('sip-support-dialout')
 	&& getCapabilities()?.spreed?.config.call['sip-enabled']

src/components/LeftSidebar/NewGroupConversation/NewGroupConversation.vue

@@ -162,11 +162,11 @@
 </template>
 
 <script>
+import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
+import Check from 'vue-material-design-icons/Check.vue'
 
 import { getCapabilities } from '@nextcloud/capabilities'
 import { showError } from '@nextcloud/dialogs'
-import Check from 'vue-material-design-icons/Check.vue'
-import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
 
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
@@ -175,10 +175,10 @@ import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcPasswordField from '@nextcloud/vue/dist/Components/NcPasswordField.js'
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
 
+import SetContacts from './SetContacts/SetContacts.vue'
 import ConversationAvatarEditor from '../../ConversationSettings/ConversationAvatarEditor.vue'
 import ListableSettings from '../../ConversationSettings/ListableSettings.vue'
 import LoadingComponent from '../../LoadingComponent.vue'
-import SetContacts from './SetContacts/SetContacts.vue'
 
 import { useIsInCall } from '../../../composables/useIsInCall.js'
 import { CONVERSATION, PRIVACY } from '../../../constants.js'

src/components/LeftSidebar/NewGroupConversation/SetContacts/SetContacts.vue

@@ -83,11 +83,11 @@ import { showError } from '@nextcloud/dialogs'
 
 import NcTextField from '@nextcloud/vue/dist/Components/NcTextField.js'
 
+import ContactSelectionBubble from './ContactSelectionBubble/ContactSelectionBubble.vue'
 import DialpadPanel from '../../../DialpadPanel.vue'
 import ParticipantSearchResults from '../../../RightSidebar/Participants/ParticipantsSearchResults/ParticipantsSearchResults.vue'
 import SelectPhoneNumber from '../../../SelectPhoneNumber.vue'
 import TransitionWrapper from '../../../TransitionWrapper.vue'
-import ContactSelectionBubble from './ContactSelectionBubble/ContactSelectionBubble.vue'
 
 import { useArrowNavigation } from '../../../../composables/useArrowNavigation.js'
 import { searchPossibleConversations } from '../../../../services/conversationsService.js'

src/components/MediaSettings/MediaSettings.vue

@@ -219,12 +219,12 @@ import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 import NcNoteCard from '@nextcloud/vue/dist/Components/NcNoteCard.js'
 import Tooltip from '@nextcloud/vue/dist/Directives/Tooltip.js'
 
+import VideoBackgroundEditor from './VideoBackgroundEditor.vue'
 import AvatarWrapper from '../AvatarWrapper/AvatarWrapper.vue'
 import VideoBackground from '../CallView/shared/VideoBackground.vue'
 import MediaDevicesSelector from '../MediaDevicesSelector.vue'
 import CallButton from '../TopBar/CallButton.vue'
 import VolumeIndicator from '../VolumeIndicator/VolumeIndicator.vue'
-import VideoBackgroundEditor from './VideoBackgroundEditor.vue'
 
 import { useIsInCall } from '../../composables/useIsInCall.js'
 import { AVATAR, CALL, PARTICIPANT, VIRTUAL_BACKGROUND } from '../../constants.js'

src/components/MessagesList/MessagesGroup/Message/Message.spec.js

@@ -12,14 +12,14 @@ import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 
-import Quote from '../../../Quote.vue'
 import Message from './Message.vue'
 import MessageButtonsBar from './MessageButtonsBar/MessageButtonsBar.vue'
 import DeckCard from './MessagePart/DeckCard.vue'
 import DefaultParameter from './MessagePart/DefaultParameter.vue'
 import FilePreview from './MessagePart/FilePreview.vue'
 import Location from './MessagePart/Location.vue'
 import Mention from './MessagePart/Mention.vue'
+import Quote from '../../../Quote.vue'
 
 import * as useIsInCallModule from '../../../../composables/useIsInCall.js'
 import { CONVERSATION, ATTENDEE, PARTICIPANT } from '../../../../constants.js'

src/components/MessagesList/MessagesGroup/Message/Message.vue

@@ -267,8 +267,6 @@ import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 import NcPopover from '@nextcloud/vue/dist/Components/NcPopover.js'
 import NcRichText from '@nextcloud/vue/dist/Components/NcRichText.js'
 
-import Quote from '../../../Quote.vue'
-import CallButton from '../../../TopBar/CallButton.vue'
 import MessageButtonsBar from './MessageButtonsBar/MessageButtonsBar.vue'
 import MessageTranslateDialog from './MessageButtonsBar/MessageTranslateDialog.vue'
 import Contact from './MessagePart/Contact.vue'
@@ -278,6 +276,8 @@ import FilePreview from './MessagePart/FilePreview.vue'
 import Location from './MessagePart/Location.vue'
 import Mention from './MessagePart/Mention.vue'
 import Poll from './MessagePart/Poll.vue'
+import Quote from '../../../Quote.vue'
+import CallButton from '../../../TopBar/CallButton.vue'
 
 import { useIsInCall } from '../../../../composables/useIsInCall.js'
 import { ATTENDEE, CONVERSATION, PARTICIPANT } from '../../../../constants.js'

src/components/MessagesList/MessagesGroup/Message/MessagePart/Poll.vue

@@ -140,8 +140,8 @@
 import FileLock from 'vue-material-design-icons/FileLock.vue'
 import PollIcon from 'vue-material-design-icons/Poll.vue'
 
-import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcActionButton from '@nextcloud/vue/dist/Components/NcActionButton.js'
+import NcActions from '@nextcloud/vue/dist/Components/NcActions.js'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcCheckboxRadioSwitch from '@nextcloud/vue/dist/Components/NcCheckboxRadioSwitch.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'

src/components/MessagesList/MessagesGroup/MessagesGroup.vue

@@ -47,8 +47,8 @@
 </template>
 
 <script>
-import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 import Message from './Message/Message.vue'
+import AvatarWrapper from '../../AvatarWrapper/AvatarWrapper.vue'
 
 import { ATTENDEE, AVATAR } from '../../../constants.js'
 import { useGuestNameStore } from '../../../stores/guestName.js'

src/components/MessagesList/MessagesList.vue

@@ -80,9 +80,9 @@
 
 import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 
-import LoadingPlaceholder from '../LoadingPlaceholder.vue'
 import MessagesGroup from './MessagesGroup/MessagesGroup.vue'
 import MessagesSystemGroup from './MessagesGroup/MessagesSystemGroup.vue'
+import LoadingPlaceholder from '../LoadingPlaceholder.vue'
 
 import { useIsInCall } from '../../composables/useIsInCall.js'
 import { ATTENDEE, CHAT } from '../../constants.js'
@@ -811,7 +811,7 @@
 			this.debounceUpdateReadMarkerPosition()
 		},
 
 		/**
 		 * Finds the last message that is fully visible in the scroller viewport
 		 *
 		 * Starts searching forward after the given message element until we reach

src/components/NewMessage/NewMessage.vue

@@ -170,13 +170,13 @@ import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcEmojiPicker from '@nextcloud/vue/dist/Components/NcEmojiPicker.js'
 import NcRichContenteditable from '@nextcloud/vue/dist/Components/NcRichContenteditable.js'
 
-import Quote from '../Quote.vue'
 import NewMessageAbsenceInfo from './NewMessageAbsenceInfo.vue'
 import NewMessageAttachments from './NewMessageAttachments.vue'
 import NewMessageAudioRecorder from './NewMessageAudioRecorder.vue'
 import NewMessageNewFileDialog from './NewMessageNewFileDialog.vue'
 import NewMessagePollEditor from './NewMessagePollEditor.vue'
 import NewMessageTypingIndicator from './NewMessageTypingIndicator.vue'
+import Quote from '../Quote.vue'
 
 import { CONVERSATION, PARTICIPANT, PRIVACY } from '../../constants.js'
 import { EventBus } from '../../services/EventBus.js'

src/components/NewMessage/NewMessageUploadEditor.vue

@@ -97,9 +97,9 @@ import { getCapabilities } from '@nextcloud/capabilities'
 import NcButton from '@nextcloud/vue/dist/Components/NcButton.js'
 import NcModal from '@nextcloud/vue/dist/Components/NcModal.js'
 
+import NewMessage from './NewMessage.vue'
 import AudioPlayer from '../MessagesList/MessagesGroup/Message/MessagePart/AudioPlayer.vue'
 import FilePreview from '../MessagesList/MessagesGroup/Message/MessagePart/FilePreview.vue'
-import NewMessage from './NewMessage.vue'
 import TransitionWrapper from '../TransitionWrapper.vue'
 
 const supportMediaCaption = getCapabilities()?.spreed?.features?.includes('media-caption')

src/components/RightSidebar/BreakoutRooms/BreakoutRoomsTab.vue

@@ -53,11 +53,10 @@ import DotsCircle from 'vue-material-design-icons/DotsCircle.vue'
 
 import NcEmptyContent from '@nextcloud/vue/dist/Components/NcEmptyContent.js'
 
-import Participant from '../Participants/ParticipantsList/Participant/Participant.vue'
 import BreakoutRoomItem from './BreakoutRoomItem.vue'
 import BreakoutRoomsActions from './BreakoutRoomsActions.vue'
+import Participant from '../Participants/ParticipantsList/Participant/Participant.vue'
 
-// Constants
 import { CONVERSATION, PARTICIPANT } from '../../../constants.js'
 
 export default {