fixup! feat(LeftSidebar): add controls for conversations sort

Signed-off-by: Maksim Sukharev <antreesy.web@gmail.com>

Author: Antreesy

src/components/LeftSidebar/LeftSidebar.vue

@@ -110,9 +110,22 @@
 
 							<NcActionButton
 								closeAfterClick
-								type="checkbox"
-								:modelValue="groupMode === CONVERSATION.GROUP_MODE.PRIVATE_FIRST"
-								@click="handleGroupMode(CONVERSATION.GROUP_MODE.PRIVATE_FIRST)">
+								type="radio"
+								:value="CONVERSATION.GROUP_MODE.NONE"
+								:modelValue="groupMode"
+								@update:modelValue="handleGroupMode">
+								<template #icon>
+									<IconCancel :size="20" />
+								</template>
+								{{ SORT_LABELS.GROUPBY_NONE }}
+							</NcActionButton>
+
+							<NcActionButton
+								closeAfterClick
+								type="radio"
+								:value="CONVERSATION.GROUP_MODE.PRIVATE_FIRST"
+								:modelValue="groupMode"
+								@update:modelValue="handleGroupMode">
 								<template #icon>
 									<IconAccountOutline :size="20" />
 								</template>
@@ -121,9 +134,10 @@
 
 							<NcActionButton
 								closeAfterClick
-								type="checkbox"
-								:modelValue="groupMode === CONVERSATION.GROUP_MODE.GROUP_FIRST"
-								@click="handleGroupMode(CONVERSATION.GROUP_MODE.GROUP_FIRST)">
+								type="radio"
+								:value="CONVERSATION.GROUP_MODE.GROUP_FIRST"
+								:modelValue="groupMode"
+								@update:modelValue="handleGroupMode">
 								<template #icon>
 									<IconAccountMultipleOutline :size="20" />
 								</template>
@@ -381,6 +395,7 @@ import IconArchiveOutline from 'vue-material-design-icons/ArchiveOutline.vue'
 import IconArrowLeft from 'vue-material-design-icons/ArrowLeft.vue'
 import IconAt from 'vue-material-design-icons/At.vue'
 import IconCalendarBlankOutline from 'vue-material-design-icons/CalendarBlankOutline.vue'
+import IconCancel from 'vue-material-design-icons/Cancel.vue'
 import IconChatPlusOutline from 'vue-material-design-icons/ChatPlusOutline.vue'
 import IconClockOutline from 'vue-material-design-icons/ClockOutline.vue'
 import IconCogOutline from 'vue-material-design-icons/CogOutline.vue'
@@ -457,6 +472,8 @@ const SORT_LABELS = {
 	// TRANSLATORS Navigation actions: group (verb) by putting private or group (noun) conversations higher in the list
 	GROUPBY_HEADER: t('spreed', 'Group conversations'),
 	// TRANSLATORS Navigation actions: group (verb) by putting private or group (noun) conversations higher in the list
+	GROUPBY_NONE: t('spreed', 'Do not group'),
+	// TRANSLATORS Navigation actions: group (verb) by putting private or group (noun) conversations higher in the list
 	GROUPBY_PRIVATE_FIRST: t('spreed', 'Show private ones first'),
 	// TRANSLATORS Navigation actions: group (verb) by putting private or group (noun) conversations higher in the list
 	GROUPBY_GROUP_FIRST: t('spreed', 'Show group ones first'),
@@ -492,6 +509,7 @@ export default {
 		// Icons
 		IconAccountMultiplePlusOutline,
 		IconAt,
+		IconCancel,
 		IconMessageBadgeOutline,
 		IconMessageOutline,
 		IconFilterCogOutline,
@@ -852,12 +870,7 @@ export default {
 		},
 
 		handleGroupMode(newValue) {
-			if (newValue === this.groupMode) {
-				// Reset mode
-				this.settingsStore.updateGroupMode(CONVERSATION.GROUP_MODE.NONE)
-			} else {
-				this.settingsStore.updateGroupMode(newValue)
-			}
+			this.settingsStore.updateGroupMode(newValue)
 		},
 
 		handleFilter(filter) {