fix(dialog): keep the share-type tabs and confirm dropping invited people

The Invited/Anyone tabs disappeared as soon as a recipient existed, including
the link's own token recipient, so they vanished right after picking "Anyone".
Always show the tabs instead.

Switching to "Anyone" now asks for confirmation when invited people are
present, and removes them, since a public link cannot keep them.

Assisted-by: ClaudeCode:claude-opus-4-8
Signed-off-by: skjnldsv <skjnldsv@protonmail.com>

Author: skjnldsv

lib/dialog/components/SharePanel.spec.ts

@@ -35,6 +35,32 @@ vi.mock('../api/share.ts', () => ({
 	searchRecipients: vi.fn().mockResolvedValue([]),
 }))
 
+// Confirm dialog: always answer with the last button ("Continue").
+vi.mock('@nextcloud/dialogs', () => ({
+	DialogBuilder: class {
+		buttons: { callback: () => void }[] = []
+		setName() {
+			return this
+		}
+
+		setText() {
+			return this
+		}
+
+		setButtons(buttons: { callback: () => void }[]) {
+			this.buttons = buttons
+			return this
+		}
+
+		build() {
+			const { buttons } = this
+			return {
+				show: async () => buttons.at(-1)?.callback(),
+			}
+		}
+	},
+}))
+
 /**
  * Build a share schema.
  *
@@ -156,14 +182,17 @@ describe('SharePanel tab bar', () => {
 		permissions: [],
 	}
 
-	it('shows the share-type tabs when there are no recipients', () => {
-		const { wrapper } = mountPanel()
-		expect(wrapper.findComponent({ name: 'NcRadioGroup' }).exists()).toBe(true)
+	it('always shows the share-type tabs', () => {
+		expect(mountPanel().wrapper.findComponent({ name: 'NcRadioGroup' }).exists()).toBe(true)
+		const withRecipient = mountPanel(schema({ recipients: [recipient] }))
+		expect(withRecipient.wrapper.findComponent({ name: 'NcRadioGroup' }).exists()).toBe(true)
 	})
 
-	it('hides the share-type tabs once a recipient exists', () => {
-		const { wrapper } = mountPanel(schema({ recipients: [recipient] }))
-		expect(wrapper.findComponent({ name: 'NcRadioGroup' }).exists()).toBe(false)
+	it('confirms and drops invited people when switching to the link tab', async () => {
+		const { wrapper, share } = mountPanel(schema({ recipients: [recipient] }))
+		wrapper.findComponent({ name: 'NcRadioGroup' }).vm.$emit('update:modelValue', ShareDialogTab.Anyone)
+		await flushPromises()
+		expect(share.removeRecipient).toHaveBeenCalledWith(RECIPIENT_TYPE_USER, 'bob', undefined)
 	})
 })
 

lib/dialog/components/SharePanel.vue

@@ -6,14 +6,12 @@
 	<form class="share-panel" @submit.prevent>
 		<!-- First page view -->
 		<template v-if="!inSettings">
-			<!-- Share type is committed once a recipient (or the link) exists -->
 			<NcRadioGroup
-				v-if="!hasRecipients"
 				class="share-panel__tab-bar"
 				:modelValue="shareDialogTab"
 				:label="t('Share type')"
 				:hideLabel="true"
-				@update:modelValue="shareDialogTab = ($event as ShareDialogTab)">
+				@update:modelValue="onTabChange($event as ShareDialogTab)">
 				<NcRadioGroupButton
 					v-for="type in shareTypes"
 					:key="type.id"
@@ -171,6 +169,7 @@ import AccountPlusOutlineIconSvg from '@mdi/svg/svg/account-plus-outline.svg?raw
 import IconContentCopy from '@mdi/svg/svg/content-copy.svg?raw'
 import IconSend from '@mdi/svg/svg/send-outline.svg?raw'
 import WorldMapOutlineSvg from '@mdi/svg/svg/web.svg?raw'
+import { DialogBuilder } from '@nextcloud/dialogs'
 import { computed, ref, watch } from 'vue'
 import NcButton from '@nextcloud/vue/components/NcButton'
 import NcIconSvgWrapper from '@nextcloud/vue/components/NcIconSvgWrapper'
@@ -187,10 +186,10 @@ import { useLinkShare } from '../composables/useLinkShare.ts'
 import { usePermissionPresets } from '../composables/usePermissionPresets.ts'
 import { useRecipientSearch } from '../composables/useRecipientSearch.ts'
 import { useShareProperties } from '../composables/useShareProperties.ts'
-import { PROPERTY_EXPIRATION, PROPERTY_PASSWORD } from '../constants.ts'
+import { PROPERTY_EXPIRATION, PROPERTY_PASSWORD, RECIPIENT_TYPE_TOKEN } from '../constants.ts'
 import { ShareDialogTab } from '../types/ui.ts'
 import { getOcsErrorMessage } from '../utils/api.ts'
-import { t } from '../utils/l10n.ts'
+import { n, t } from '../utils/l10n.ts'
 import { logger } from '../utils/logger.ts'
 import { isLongTextProperty, isOptionalProperty } from '../utils/property.ts'
 import { shareOutcomeSummary } from '../utils/summary.ts'
@@ -218,8 +217,70 @@ const isLinkShare = computed(() => shareDialogTab.value === ShareDialogTab.Anyon
 // A share cannot be submitted without at least one recipient.
 const canSubmit = computed(() => props.share.recipients.length > 0)
 
-// Once a recipient (or the link) exists, the share type is committed.
-const hasRecipients = computed(() => props.share.recipients.length > 0)
+// Invited people: every recipient except the link (token) one.
+const invitedRecipients = computed(() => props.share.recipients.filter((recipient) => recipient.class !== RECIPIENT_TYPE_TOKEN))
+
+/**
+ * Ask before dropping the invited people when switching to a public link.
+ *
+ * @param count Number of invited people that would be removed
+ */
+async function confirmDropInvited(count: number): Promise<boolean> {
+	let confirmed = false
+	const dialog = (new DialogBuilder())
+		.setName(t('Share with anyone'))
+		.setText(n(
+			'Switching to a public link removes %n invited person from this share.',
+			'Switching to a public link removes %n invited people from this share.',
+			count,
+		))
+		.setButtons([
+			{
+				label: t('Cancel'),
+				variant: 'secondary',
+				callback: () => {},
+			},
+			{
+				label: t('Continue'),
+				variant: 'primary',
+				callback: () => {
+					confirmed = true
+				},
+			},
+		])
+		.build()
+	try {
+		await dialog.show()
+	} catch (e) {
+		logger.debug('Share type confirmation dialog closed', { error: e })
+	}
+	return confirmed
+}
+
+/**
+ * Switch the share type. A public link cannot keep invited people, so confirm
+ * and remove them first.
+ *
+ * @param tab The tab to switch to
+ */
+async function onTabChange(tab: ShareDialogTab) {
+	if (tab === shareDialogTab.value) {
+		return
+	}
+	if (tab === ShareDialogTab.Anyone && invitedRecipients.value.length > 0) {
+		if (!await confirmDropInvited(invitedRecipients.value.length)) {
+			return
+		}
+		for (const recipient of invitedRecipients.value) {
+			try {
+				await props.share.removeRecipient(recipient.class, recipient.value, recipient.instance ?? undefined)
+			} catch (e) {
+				logger.error('Failed to remove recipient while switching to a link share', { error: e, recipient: recipient.value })
+			}
+		}
+	}
+	shareDialogTab.value = tab
+}
 
 // Editable properties, permissions/presets, recipient search and link handling
 // live in dedicated composables; this component wires them to the template.

vitest.config.ts

@@ -19,7 +19,9 @@ export default defineConfig({
 		// @nextcloud/vue ships ESM + CSS that must be transformed by Vite in tests.
 		server: {
 			deps: {
-				inline: [/@nextcloud\/vue/],
+				// @nextcloud/dialogs pulls @nextcloud/vue components (and their CSS),
+				// both must be transformed by Vite in tests.
+				inline: [/@nextcloud\/vue/, /@nextcloud\/dialogs/],
 			},
 		},
 		coverage: {