From b6bd3ca0286f0848a3a52bf78f5f7aa93a609801 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Tue, 22 Jul 2025 19:36:25 +0200
Subject: [PATCH 1/9] fix vote indicator and confirmed option

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/assets/scss/vars.scss                  |   2 +
 src/components/Base/modules/StickyDiv.vue  | 156 ++++++++++++---------
 src/components/Options/Counter.vue         |   8 +-
 src/components/Options/OptionItem.vue      |  11 ++
 src/components/VoteTable/VoteButton.vue    |  62 ++++----
 src/components/VoteTable/VoteColumn.vue    |  98 -------------
 src/components/VoteTable/VoteIndicator.vue |  28 ++--
 src/components/VoteTable/VoteItem.vue      |  29 ++--
 src/components/VoteTable/VoteTable.vue     |  38 +++--
 src/stores/poll.ts                         |  10 +-
 src/stores/votes.ts                        |   1 -
 src/views/Vote.vue                         |   3 +-
 12 files changed, 190 insertions(+), 256 deletions(-)
 delete mode 100644 src/components/VoteTable/VoteColumn.vue

diff --git a/src/assets/scss/vars.scss b/src/assets/scss/vars.scss
index f6858a2df4..5fe5ec20bb 100644
--- a/src/assets/scss/vars.scss
+++ b/src/assets/scss/vars.scss
@@ -11,4 +11,6 @@
 	--color-polls-background-maybe: rgba(var(--color-warning-rgb), 0.1);
 	--container-background-light: rgba(var(--color-info-rgb), 0.1);
 	--cap-width: 49rem;
+	--shadow-height: 0.7rem;
+	--shadow-height-inverted: -0.7rem;
 }
diff --git a/src/components/Base/modules/StickyDiv.vue b/src/components/Base/modules/StickyDiv.vue
index e14b7f9a5d..8d3159c154 100644
--- a/src/components/Base/modules/StickyDiv.vue
+++ b/src/components/Base/modules/StickyDiv.vue
@@ -50,7 +50,6 @@ const style = computed(() => {
 })
 
 const stickyClass = computed(() => ({
-	container: true,
 	'sticky-top': stickyTop,
 	'sticky-left': stickyLeft,
 	'sticky-bottom-shadow': activateBottomShadow,
@@ -59,93 +58,114 @@ const stickyClass = computed(() => ({
 </script>
 
 <template>
-	<div :class="stickyClass" :style="style">
-		<slot name="default">
-			<div class="inner"></div>
-		</slot>
+	<div :class="['sticky-div', stickyClass]" :style="style">
+		<div class="top-left-corner"></div>
+		<div class="top"></div>
+		<div class="top-right-corner"></div>
+
+		<div class="right"></div>
+
+		<div class="bottom-right-corner"></div>
+		<div class="bottom"></div>
+		<div class="bottom-left-corner"></div>
+
+		<div class="left"></div>
+
+		<div class="stage outer" :style="style">
+			<slot name="default">
+				<div class="inner"></div>
+			</slot>
+		</div>
 	</div>
 </template>
 
 <style lang="scss" scoped>
-.container {
-	--shadow-height: 10px;
+.sticky-div {
+	display: grid;
+	grid-template-columns: auto 1fr auto;
+	grid-template-rows: auto 1fr auto;
+	grid-template-areas:
+		'top-left-corner top top-right-corner'
+		'left center right'
+		'bottom-left-corner bottom bottom-right-corner';
 }
 
-.inner {
+.stage {
+	padding: 0.3rem;
+	grid-area: center;
 	width: 100%;
 	height: 100%;
 	background-color: var(--color-main-background);
 }
 
+.top-left-corner {
+	grid-area: top-left-corner;
+	height: 0;
+	width: 0;
+}
+
+.top {
+	grid-area: top;
+	height: 0;
+}
+
+.top-right-corner {
+	grid-area: top-right-corner;
+	height: 0;
+	width: 0;
+}
+
+.right {
+	grid-area: right;
+	width: 0;
+}
+
+.bottom-right-corner {
+	grid-area: bottom-right-corner;
+	height: 0;
+	width: 0;
+}
+
+.bottom {
+	grid-area: bottom;
+	height: 0;
+}
+
+.bottom-left-corner {
+	grid-area: bottom-left-corner;
+	height: 0;
+	width: 0;
+}
+
+.left {
+	grid-area: left;
+	width: 0;
+}
+
 .sticky-left {
 	position: sticky;
 	left: 0;
 }
 
 .sticky-top {
-	--shadow-height: 10px;
 	position: sticky;
 	top: 0;
-	padding-bottom: 0px;
-	padding-bottom: var(--shadow-height);
-
-	&::after {
-		content: '';
-		position: absolute;
-		bottom: 0;
-		left: -1px;
-		right: 0;
-		height: 0;
-		background: linear-gradient(
-			to bottom,
-			rgba(var(--color-box-shadow-rgb), 0.3),
-			rgba(var(--color-box-shadow-rgb), 0)
-		);
-		transition:
-			all var(--animation-slow) linear,
-			border 1ms;
-	}
-
-	&.sticky-bottom-shadow {
-		border-top: 0;
-		padding-bottom: var(--shadow-height);
-		margin-bottom: 0;
-		&::after {
-			height: var(--shadow-height);
-		}
-	}
 }
 
-/* TODO: Implement sticky right shadow
-	An Alternative could be using a grid instead of ::after
-	to be able to position multiple shadows in all directions */
-
-/*
-	padding-right: var(--shadow-height);
-
-	&::after {
-		content: '';
-		position: absolute;
-		right: 0;
-		top: -1px;
-		bottom: 0;
-		width: 0;
-		background: linear-gradient(
-			to right,
-			rgba(var(--color-box-shadow-rgb), 0.3),
-			rgba(var(--color-box-shadow-rgb), 0)
-		);
-		transition:
-			all var(--animation-slow) linear,
-			border 1ms;
+.bottom-right-corner,
+.bottom,
+.bottom-left-corner {
+	background: linear-gradient(
+		to bottom,
+		rgba(var(--color-box-shadow-rgb), 0.3),
+		rgba(var(--color-box-shadow-rgb), 0)
+	);
+
+	transition:
+		all var(--animation-slow) linear,
+		border 1ms;
+	.sticky-bottom-shadow & {
+		height: var(--shadow-height);
 	}
-
-	&.sticky-right-shadow {
-		border-right: 0;
-		padding-right: var(--shadow-height);
-		margin-right: 0;
-		&::after {
-			width: var(--shadow-height);
-		}
-	} */
+}
 </style>
diff --git a/src/components/Options/Counter.vue b/src/components/Options/Counter.vue
index b901ba2aba..2c21285ece 100644
--- a/src/components/Options/Counter.vue
+++ b/src/components/Options/Counter.vue
@@ -6,8 +6,11 @@
 <script setup lang="ts">
 import YesCounterIcon from 'vue-material-design-icons/AccountCheck.vue'
 import MaybeCounterIcon from 'vue-material-design-icons/AccountCheckOutline.vue'
+import CheckboxMarkedOutlinedIcon from 'vue-material-design-icons/CheckboxMarkedOutline.vue'
 import { Option } from '../../Types/index.ts'
+import { usePollStore } from '../../stores/poll.ts'
 
+const pollStore = usePollStore()
 interface Props {
 	option: Option
 	showMaybe?: boolean
@@ -17,7 +20,10 @@ const { option, showMaybe = false } = defineProps<Props>()
 </script>
 
 <template>
-	<div class="counter">
+	<div v-if="option.confirmed && pollStore.status.isExpired" class="counter">
+		<CheckboxMarkedOutlinedIcon :size="20" />
+	</div>
+	<div v-else class="counter">
 		<div class="yes">
 			<YesCounterIcon
 				fill-color="var(--color-polls-foreground-yes)"
diff --git a/src/components/Options/OptionItem.vue b/src/components/Options/OptionItem.vue
index 59fb22b21a..14a9ddfb90 100644
--- a/src/components/Options/OptionItem.vue
+++ b/src/components/Options/OptionItem.vue
@@ -64,6 +64,17 @@ const pollStore = usePollStore()
 	grid-template-areas: 'drag option owner actions';
 	position: relative;
 	padding: 8px 0;
+	background-color: var(--color-main-background);
+	.confirmed & {
+		background-color: var(--color-polls-background-yes);
+		border-radius: var(--border-radius-container);
+		border: 2px solid var(--color-success-text);
+	}
+	.list-view .confirmed & {
+		padding-left: 0.5rem;
+		left: -0.5rem;
+		padding-right: 0.5rem;
+	}
 }
 
 .grid-area-drag-icon {
diff --git a/src/components/VoteTable/VoteButton.vue b/src/components/VoteTable/VoteButton.vue
index 213ce88218..ee5276528e 100644
--- a/src/components/VoteTable/VoteButton.vue
+++ b/src/components/VoteTable/VoteButton.vue
@@ -5,64 +5,62 @@
 
 <script setup lang="ts">
 import { computed } from 'vue'
+import { AxiosError } from '@nextcloud/axios'
+
+import { t } from '@nextcloud/l10n'
 import { showSuccess, showError } from '@nextcloud/dialogs'
 
+import VoteIndicator from './VoteIndicator.vue'
 import { usePollStore } from '../../stores/poll.ts'
-import { useVotesStore } from '../../stores/votes.ts'
+import { Answer, useVotesStore } from '../../stores/votes.ts'
 import { Option, User } from '../../Types/index.ts'
 
-import { t } from '@nextcloud/l10n'
-import VoteIndicator from './VoteIndicator.vue'
-import { AxiosError } from '@nextcloud/axios'
-
 interface Props {
 	option: Option
 	user: User
 }
 
+export type richAnswer = {
+	name: Answer
+	translated: string
+}
+
+const richAnswers: { [key in Answer]: richAnswer } = {
+	yes: { name: 'yes', translated: t('polls', 'Yes') },
+	maybe: { name: 'maybe', translated: t('polls', 'Maybe') },
+	no: { name: 'no', translated: t('polls', 'No') },
+	'': { name: '', translated: t('polls', 'No answer') },
+}
+
 const { option, user } = defineProps<Props>()
 
 const pollStore = usePollStore()
 const votesStore = useVotesStore()
 
-const thisVote = computed(() =>
+const vote = computed(() =>
 	votesStore.getVote({
 		option,
 		user,
 	}),
 )
 
-const iconAnswer = computed(() => {
-	if (['no', ''].includes(thisVote.value.answer)) {
-		return pollStore.isClosed && option.confirmed ? 'no' : ''
+const nextAnswer = computed<richAnswer>(() => {
+	if (['no', ''].includes(vote.value.answer)) {
+		return richAnswers.yes
 	}
-	return thisVote.value.answer
-})
 
-const nextAnswer = computed(() => {
-	if (pollStore.answerSequence.indexOf(thisVote.value.answer) < 0) {
-		return pollStore.answerSequence[1]
+	if (vote.value.answer === 'yes' && pollStore.configuration.allowMaybe) {
+		return richAnswers.maybe
 	}
-	return pollStore.answerSequence[
-		(pollStore.answerSequence.indexOf(thisVote.value.answer) + 1)
-			% pollStore.answerSequence.length
-	]
-})
-const nextAnswerTranslated = computed(() => {
-	if (nextAnswer.value === 'yes') {
-		return t('polls', 'Yes')
-	}
-	if (nextAnswer.value === 'maybe') {
-		return t('polls', 'Maybe')
-	}
-	return t('polls', 'No')
+
+	return pollStore.configuration.useNo ? richAnswers.no : richAnswers['']
 })
 
 async function setVote() {
 	try {
 		await votesStore.set({
 			option,
-			setTo: nextAnswer.value,
+			setTo: nextAnswer.value.name,
 		})
 		showSuccess(t('polls', 'Vote saved'), { timeout: 2000 })
 	} catch (error) {
@@ -78,15 +76,15 @@ async function setVote() {
 <template>
 	<button
 		class="vote-button active"
-		:class="[thisVote.answer]"
+		:class="[vote.answer]"
 		:aria-label="
-			t('polls', 'Vote {nextAnswer} for {option}', {
+			t('polls', 'Click to vote with {nextAnswer} for option {option}', {
 				option: option.text,
-				nextAnswer: nextAnswerTranslated,
+				nextAnswer: nextAnswer.translated,
 			})
 		"
 		@click="setVote()">
-		<VoteIndicator :answer="iconAnswer" />
+		<VoteIndicator :answer="vote.answer" />
 	</button>
 </template>
 
diff --git a/src/components/VoteTable/VoteColumn.vue b/src/components/VoteTable/VoteColumn.vue
deleted file mode 100644
index 9303b4a8b5..0000000000
--- a/src/components/VoteTable/VoteColumn.vue
+++ /dev/null
@@ -1,98 +0,0 @@
-<!--
-  - SPDX-FileCopyrightText: 2018 Nextcloud contributors
-  - SPDX-License-Identifier: AGPL-3.0-or-later
--->
-
-<script setup lang="ts">
-import { computed } from 'vue'
-import { getCurrentUser } from '@nextcloud/auth'
-
-import Counter from '../Options/Counter.vue'
-import OptionItem from '../Options/OptionItem.vue'
-import VoteItem from './VoteItem.vue'
-import CalendarPeek from '../Calendar/CalendarPeek.vue'
-import { usePollStore } from '../../stores/poll.ts'
-import { useVotesStore } from '../../stores/votes.ts'
-import { usePreferencesStore } from '../../stores/preferences.ts'
-import { Option } from '../../stores/options.ts'
-import OptionMenu from '../Options/OptionMenu.vue'
-
-const { option } = defineProps<{ option: Option }>()
-
-const pollStore = usePollStore()
-const votesStore = useVotesStore()
-const preferencesStore = usePreferencesStore()
-
-const componentClass = computed(() => {
-	const classList = ['vote-column']
-	if (option.locked) {
-		classList.push('locked')
-	}
-
-	if (option.confirmed && pollStore.isClosed) {
-		classList.push('confirmed')
-	}
-	if (option.votes.currentUser) {
-		classList.push(option.votes.currentUser)
-	}
-
-	return classList
-})
-
-const showCalendarPeek = computed(
-	() =>
-		pollStore.type === 'datePoll'
-		&& getCurrentUser()
-		&& preferencesStore.user.calendarPeek,
-)
-</script>
-
-<template>
-	<div :class="componentClass">
-		<div class="option-menu">
-			<OptionMenu :option="option" use-sort />
-		</div>
-		<div class="column-header">
-			<OptionItem :option="option" />
-
-			<Counter
-				v-if="pollStore.permissions.seeResults"
-				:show-maybe="pollStore.configuration.allowMaybe"
-				:option="option" />
-
-			<CalendarPeek
-				v-if="showCalendarPeek"
-				:focus-trap="false"
-				:option="option" />
-		</div>
-
-		<VoteItem
-			v-for="participant in votesStore.getChunkedParticipants"
-			:key="participant.id"
-			:user="participant"
-			:option="option" />
-	</div>
-</template>
-
-<style lang="scss">
-.option-menu {
-	// display: grid;
-	// grid-template-columns: 1fr auto;
-	// grid-template-areas: 'menu sort';
-	// align-content: center;
-	align-self: center;
-	flex: 0 0 34px;
-}
-
-.vote-style-beta-510 .vote-column {
-	border-radius: var(--border-radius-large);
-
-	&:hover {
-		background-color: var(--color-background-dark);
-	}
-
-	&.locked:hover {
-		background-color: var(--color-polls-background-no);
-	}
-}
-</style>
diff --git a/src/components/VoteTable/VoteIndicator.vue b/src/components/VoteTable/VoteIndicator.vue
index c583e462cd..d4ec3b3914 100644
--- a/src/components/VoteTable/VoteIndicator.vue
+++ b/src/components/VoteTable/VoteIndicator.vue
@@ -4,15 +4,15 @@
 -->
 
 <script setup lang="ts">
-import { computed } from 'vue'
 import CheckIcon from 'vue-material-design-icons/Check.vue'
 import CloseIcon from 'vue-material-design-icons/Close.vue'
+import CancelIcon from 'vue-material-design-icons/Cancel.vue'
 import { MaybeIcon } from '../AppIcons/index.ts'
 import { Answer } from '../../Types/index.ts'
 
 const ICON_SIZE = 26
 
-const { answer } = defineProps<{ answer: Answer }>()
+const { answer } = defineProps<{ answer: Answer | 'locked' }>()
 
 const colorCodeNo = getComputedStyle(document.documentElement).getPropertyValue(
 	'--color-error',
@@ -23,31 +23,25 @@ const colorCodeYes = getComputedStyle(document.documentElement).getPropertyValue
 const colorCodeMaybe = getComputedStyle(document.documentElement).getPropertyValue(
 	'--color-warning',
 )
-
-const foregroundColor = computed(() => {
-	if (answer === 'yes') {
-		return colorCodeYes
-	}
-	if (answer === 'maybe') {
-		return colorCodeMaybe
-	}
-	return colorCodeNo
-})
 </script>
 
 <template>
 	<div class="vote-indicator">
 		<MaybeIcon
 			v-if="answer === 'maybe'"
-			:fill-color="foregroundColor"
+			:fill-color="colorCodeMaybe"
 			:size="ICON_SIZE" />
 		<CheckIcon
 			v-if="answer === 'yes'"
-			:fill-color="foregroundColor"
+			:fill-color="colorCodeYes"
 			:size="ICON_SIZE" />
 		<CloseIcon
 			v-if="answer === 'no'"
-			:fill-color="foregroundColor"
+			:fill-color="colorCodeNo"
+			:size="ICON_SIZE" />
+		<CancelIcon
+			v-if="answer === 'locked'"
+			:fill-color="colorCodeNo"
 			:size="ICON_SIZE" />
 	</div>
 </template>
@@ -61,10 +55,6 @@ const foregroundColor = computed(() => {
 	* {
 		cursor: pointer;
 	}
-	.material-design-icon {
-		width: 26px;
-		height: 26px;
-	}
 
 	&:hover {
 		width: 35px;
diff --git a/src/components/VoteTable/VoteItem.vue b/src/components/VoteTable/VoteItem.vue
index a57b3fc47d..f7e770e9ee 100644
--- a/src/components/VoteTable/VoteItem.vue
+++ b/src/components/VoteTable/VoteItem.vue
@@ -15,34 +15,35 @@ import VoteIndicator from './VoteIndicator.vue'
 interface Props {
 	option: Option
 	user: User
+	currentUser?: boolean
 }
 
-const { option, user } = defineProps<Props>()
+const { option, user, currentUser = false } = defineProps<Props>()
 
 const pollStore = usePollStore()
 const votesStore = useVotesStore()
-
-const answer = computed(
-	() =>
-		votesStore.getVote({
-			option,
-			user,
-		}).answer,
+const vote = computed(() =>
+	votesStore.getVote({
+		option,
+		user,
+	}),
 )
 
 const iconAnswer = computed(() => {
-	if (answer.value === 'no') {
-		return pollStore.isClosed && option.confirmed ? 'no' : ''
+	if (option.locked && currentUser && !pollStore.isClosed) {
+		return 'locked'
 	}
-	if (answer.value === '') {
-		return pollStore.isClosed && option.confirmed ? 'no' : ''
+
+	if (['', 'no'].includes(vote.value.answer)) {
+		return pollStore.isClosed && (option.confirmed || currentUser) ? 'no' : ''
 	}
-	return answer.value
+
+	return vote.value.answer
 })
 </script>
 
 <template>
-	<div class="vote-item" :class="answer">
+	<div class="vote-item" :class="vote.answer">
 		<VoteIndicator :answer="iconAnswer" />
 	</div>
 </template>
diff --git a/src/components/VoteTable/VoteTable.vue b/src/components/VoteTable/VoteTable.vue
index 17c6e34f21..b46f6a4f8d 100644
--- a/src/components/VoteTable/VoteTable.vue
+++ b/src/components/VoteTable/VoteTable.vue
@@ -4,29 +4,31 @@
 -->
 
 <script setup lang="ts">
+import { computed, ref } from 'vue'
+import { NcButton } from '@nextcloud/vue'
 import { t } from '@nextcloud/l10n'
+import { getCurrentUser } from '@nextcloud/auth'
 
 import { usePollStore } from '../../stores/poll.ts'
 import { Option, useOptionsStore } from '../../stores/options.ts'
 import { useVotesStore } from '../../stores/votes.ts'
 
-import { NcButton } from '@nextcloud/vue'
-import SortNameIcon from 'vue-material-design-icons/SortAlphabeticalDescending.vue'
-import { computed, ref } from 'vue'
-import { getCurrentUser } from '@nextcloud/auth'
-import Counter from '../Options/Counter.vue'
+import StickyDiv from '../Base/modules/StickyDiv.vue'
 import CalendarPeek from '../Calendar/CalendarPeek.vue'
+import Counter from '../Options/Counter.vue'
 import OptionItem from '../Options/OptionItem.vue'
 import OptionMenu from '../Options/OptionMenu.vue'
-import { usePreferencesStore } from '../../stores/preferences.ts'
-
-import SortOptionIcon from 'vue-material-design-icons/SortBoolAscendingVariant.vue'
 import VoteButton from './VoteButton.vue'
-import VoteParticipant from './VoteParticipant.vue'
 import VoteItem from './VoteItem.vue'
+import VoteParticipant from './VoteParticipant.vue'
+
+import { usePreferencesStore } from '../../stores/preferences.ts'
 import { useSessionStore } from '../../stores/session.ts'
+
 import { User } from '../../Types/index.ts'
-import StickyDiv from '../Base/modules/StickyDiv.vue'
+
+import SortOptionIcon from 'vue-material-design-icons/SortBoolAscendingVariant.vue'
+import SortNameIcon from 'vue-material-design-icons/SortAlphabeticalDescending.vue'
 
 const pollStore = usePollStore()
 const optionsStore = useOptionsStore()
@@ -134,6 +136,9 @@ function isVotable(participant: User, option: Option) {
 			<StickyDiv
 				:id="`option-item-${option.id}`"
 				class="option-item"
+				:class="{
+					confirmed: option.confirmed && pollStore.status.isExpired,
+				}"
 				:sticky-top="pollStore.viewMode === 'table-view'"
 				:activate-bottom-shadow="!downPage">
 				<OptionItem :option="option" />
@@ -143,6 +148,9 @@ function isVotable(participant: User, option: Option) {
 				v-if="pollStore.permissions.seeResults"
 				:id="`counter-${option.id}`"
 				:key="`counter-${option.id}`"
+				:class="{
+					confirmed: option.confirmed && pollStore.status.isExpired,
+				}"
 				:show-maybe="pollStore.configuration.allowMaybe"
 				:option="option" />
 
@@ -160,6 +168,7 @@ function isVotable(participant: User, option: Option) {
 					v-else
 					:key="`vote-${participant.id}-${option.id}`"
 					:user="participant"
+					:current-user="isCurrentUser(participant)"
 					:option="option" />
 			</div>
 		</template>
@@ -266,9 +275,9 @@ function isVotable(participant: User, option: Option) {
 			grid-row: 2;
 			border-inline-start: 1px solid var(--color-border);
 
-			.option-item-container {
-				background-color: var(--color-main-background);
-			}
+			// .option-item-container {
+			// 	background-color: var(--color-main-background);
+			// }
 		}
 
 		.counter {
@@ -310,6 +319,7 @@ function isVotable(participant: User, option: Option) {
 			minmax(4rem, max-content);
 		max-width: var(--cap-width);
 		width: fit-content;
+		align-items: center;
 
 		.participant {
 			display: none;
@@ -326,6 +336,8 @@ function isVotable(participant: User, option: Option) {
 
 		.vote-cell {
 			grid-column: 3;
+			width: 60px;
+			height: 60px;
 		}
 
 		@media only screen and (max-width: 340px) {
diff --git a/src/stores/poll.ts b/src/stores/poll.ts
index 40cc726852..0aa0f5af23 100644
--- a/src/stores/poll.ts
+++ b/src/stores/poll.ts
@@ -26,7 +26,7 @@ import {
 	ViewMode,
 } from '../Types/index.ts'
 
-import { useVotesStore, Answer } from './votes.ts'
+import { useVotesStore } from './votes.ts'
 import { useOptionsStore } from './options.ts'
 import { usePollsStore } from './polls.ts'
 import { useSessionStore } from './session.ts'
@@ -255,14 +255,6 @@ export const usePollStore = defineStore('poll', {
 			return 'table-view'
 		},
 
-		answerSequence(state): Answer[] {
-			const noString = state.configuration.useNo ? 'no' : ''
-			if (state.configuration.allowMaybe) {
-				return [noString, 'yes', 'maybe']
-			}
-			return [noString, 'yes']
-		},
-
 		getProposalsOptions(): {
 			value: AllowProposals
 			label: string
diff --git a/src/stores/votes.ts b/src/stores/votes.ts
index 477396a9c3..4635f6ca13 100644
--- a/src/stores/votes.ts
+++ b/src/stores/votes.ts
@@ -13,7 +13,6 @@ import { useSessionStore } from './session.ts'
 import { AxiosError } from '@nextcloud/axios'
 
 export type Answer = 'yes' | 'no' | 'maybe' | ''
-
 export type AnswerSymbol = '✔' | '❌' | '❔' | ''
 
 const answerSortOrder: { [key in Answer]: number } = {
diff --git a/src/views/Vote.vue b/src/views/Vote.vue
index 10cb3787e5..98b915606d 100644
--- a/src/views/Vote.vue
+++ b/src/views/Vote.vue
@@ -257,7 +257,8 @@ const appClass = computed(() => [
 	overflow: auto;
 	overscroll-behavior-inline: contain;
 	position: relative;
-	top: -8px;
+	top: var(--shadow-height-inverted);
+	padding-top: var(--shadow-height);
 
 	.markdown-description {
 		margin: auto;

From a6abf7577a560e08fdf9ac8670b72ed3dfa70ee4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 22 Jul 2025 07:15:12 +0000
Subject: [PATCH 2/9] build(deps): Bump form-data from 4.0.2 to 4.0.4

Bumps [form-data](https://github.com/form-data/form-data) from 4.0.2 to 4.0.4.
- [Release notes](https://github.com/form-data/form-data/releases)
- [Changelog](https://github.com/form-data/form-data/blob/master/CHANGELOG.md)
- [Commits](https://github.com/form-data/form-data/compare/v4.0.2...v4.0.4)

Signed-off-by: dartcafe <github@dartcafe.de>

---
updated-dependencies:
- dependency-name: form-data
  dependency-version: 4.0.4
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index b5d69c8446..ef25cd89c0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -7109,14 +7109,14 @@
       }
     },
     "node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
-      "license": "MIT",
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.4.tgz",
+      "integrity": "sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
         "es-set-tostringtag": "^2.1.0",
+        "hasown": "^2.0.2",
         "mime-types": "^2.1.12"
       },
       "engines": {

From abd2e3705e161237675e79bea23fa35be538d31b Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 21 Jul 2025 23:02:22 +0200
Subject: [PATCH 3/9] delete orphaned votes from poll  (Backend)

Signed-off-by: dartcafe <github@dartcafe.de>
---
 lib/AppInfo/Application.php            |  2 ++
 lib/Controller/PollApiController.php   | 12 ++++++---
 lib/Controller/PollController.php      | 37 +++++++++++++++++++++++++-
 lib/Controller/PublicController.php    |  1 +
 lib/Db/VoteMapper.php                  | 20 ++++++++++++++
 lib/Event/VoteDeletedOrphanedEvent.php | 21 +++++++++++++++
 lib/Event/VoteEvent.php                |  1 +
 lib/Service/ActivityService.php        |  6 +++++
 lib/Service/VoteService.php            | 36 +++++++++++++++++++++++++
 9 files changed, 131 insertions(+), 5 deletions(-)
 create mode 100644 lib/Event/VoteDeletedOrphanedEvent.php

diff --git a/lib/AppInfo/Application.php b/lib/AppInfo/Application.php
index d92633f54e..1d99925008 100644
--- a/lib/AppInfo/Application.php
+++ b/lib/AppInfo/Application.php
@@ -42,6 +42,7 @@
 use OCA\Polls\Event\ShareLockedEvent;
 use OCA\Polls\Event\ShareRegistrationEvent;
 use OCA\Polls\Event\ShareTypeChangedEvent;
+use OCA\Polls\Event\VoteDeletedOrphanedEvent;
 use OCA\Polls\Event\VoteEvent;
 use OCA\Polls\Event\VoteSetEvent;
 use OCA\Polls\Listener\CommentListener;
@@ -126,6 +127,7 @@ public function register(IRegistrationContext $context): void {
 
 		$context->registerEventListener(VoteEvent::class, VoteListener::class);
 		$context->registerEventListener(VoteSetEvent::class, VoteListener::class);
+		$context->registerEventListener(VoteDeletedOrphanedEvent::class, VoteListener::class);
 		$context->registerEventListener(UserDeletedEvent::class, UserDeletedListener::class);
 		$context->registerEventListener(GroupDeletedEvent::class, GroupDeletedListener::class);
 
diff --git a/lib/Controller/PollApiController.php b/lib/Controller/PollApiController.php
index 66ef7e9bbb..344a3c1a4a 100644
--- a/lib/Controller/PollApiController.php
+++ b/lib/Controller/PollApiController.php
@@ -67,6 +67,7 @@ public function get(int $pollId): DataResponse {
 			'poll' => $this->pollService->get($pollId),
 			'options' => $this->optionService->list($pollId),
 			'votes' => $this->voteService->list($pollId),
+			'orphaned' => count($this->voteService->getOprhanedVotes($pollId)),
 			'comments' => $this->commentService->list($pollId),
 			'shares' => $this->shareService->list($pollId),
 			'subscribed' => $this->subscriptionService->get($pollId),
@@ -196,13 +197,16 @@ public function getParticipantsEmailAddresses(int $pollId): DataResponse {
 	}
 
 	/**
-	 * Get valid values for configuration options
+	 * Delete orphaned votes from pollId
+	 * @param int $pollId poll id
 	 */
 	#[CORS]
 	#[NoAdminRequired]
 	#[NoCSRFRequired]
-	#[ApiRoute(verb: 'GET', url: '/api/v1.0/enum', requirements: ['apiVersion' => '(v2)'])]
-	public function enum(): DataResponse {
-		return $this->response(fn () => ['enum' => $this->pollService->getValidEnum()]);
+	#[ApiRoute(verb: 'DELETE', url: '/api/v1.0/poll/{pollId}/votes/orphaned/all', requirements: ['apiVersion' => '(v2)'])]
+	public function deleteOrphaned(int $pollId): DataResponse {
+		return $this->response(fn () => [
+			'deleted' => $this->voteService->deleteOrphanedVotes($pollId)
+		]);
 	}
 }
diff --git a/lib/Controller/PollController.php b/lib/Controller/PollController.php
index 3686cd60e5..0a7ce87c29 100644
--- a/lib/Controller/PollController.php
+++ b/lib/Controller/PollController.php
@@ -22,6 +22,7 @@
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\Attribute\FrontpageRoute;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
+use OCP\AppFramework\Http\Attribute\OpenAPI;
 use OCP\AppFramework\Http\JSONResponse;
 use OCP\IRequest;
 
@@ -56,6 +57,7 @@ public function __construct(
 	 * }>
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'GET', url: '/polls')]
 	public function listPolls(): JSONResponse {
 		return $this->response(function () {
@@ -78,6 +80,7 @@ public function listPolls(): JSONResponse {
 	 * psalm-return JSONResponse<array{poll: Poll}>
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'GET', url: '/poll/{pollId}/poll')]
 	public function get(int $pollId): JSONResponse {
 		return $this->response(fn () => [
@@ -100,6 +103,7 @@ public function get(int $pollId): JSONResponse {
 	 *
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'GET', url: '/poll/{pollId}')]
 	public function getFull(int $pollId): JSONResponse {
 		return $this->response(fn () => $this->getFullPoll($pollId, true), Http::STATUS_OK);
@@ -117,6 +121,9 @@ private function getFullPoll(int $pollId, bool $withTimings = false): array {
 		$votes = $this->voteService->list($pollId);
 		$timerMicro['votes'] = microtime(true);
 
+		$orphaned = $this->voteService->getOprhanedVotes($pollId);
+		$timerMicro['orphaned'] = microtime(true);
+
 		$comments = $this->commentService->list($pollId);
 		$timerMicro['comments'] = microtime(true);
 
@@ -130,7 +137,8 @@ private function getFullPoll(int $pollId, bool $withTimings = false): array {
 		$diffMicro['poll'] = $timerMicro['poll'] - $timerMicro['start'];
 		$diffMicro['options'] = $timerMicro['options'] - $timerMicro['poll'];
 		$diffMicro['votes'] = $timerMicro['votes'] - $timerMicro['options'];
-		$diffMicro['comments'] = $timerMicro['comments'] - $timerMicro['votes'];
+		$diffMicro['orphaned'] = $timerMicro['orphaned'] - $timerMicro['votes'];
+		$diffMicro['comments'] = $timerMicro['comments'] - $timerMicro['orphaned'];
 		$diffMicro['shares'] = $timerMicro['shares'] - $timerMicro['comments'];
 		$diffMicro['subscribed'] = $timerMicro['subscribed'] - $timerMicro['shares'];
 
@@ -139,6 +147,7 @@ private function getFullPoll(int $pollId, bool $withTimings = false): array {
 				'poll' => $poll,
 				'options' => $options,
 				'votes' => $votes,
+				'orphaned' => count($orphaned),
 				'comments' => $comments,
 				'shares' => $shares,
 				'subscribed' => $subscribed,
@@ -149,6 +158,7 @@ private function getFullPoll(int $pollId, bool $withTimings = false): array {
 			'poll' => $poll,
 			'options' => $options,
 			'votes' => $votes,
+			'orphaned' => count($orphaned),
 			'comments' => $comments,
 			'shares' => $shares,
 			'subscribed' => $subscribed,
@@ -164,6 +174,7 @@ private function getFullPoll(int $pollId, bool $withTimings = false): array {
 	 * psalm-return JSONResponse<array{poll: Poll}>
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'POST', url: '/poll/add')]
 	public function add(string $type, string $title, string $votingVariant = Poll::VARIANT_SIMPLE): JSONResponse {
 		return $this->response(
@@ -182,6 +193,7 @@ public function add(string $type, string $title, string $votingVariant = Poll::V
 	 * psalm-return JSONResponse<array{poll: Poll}>
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'PUT', url: '/poll/{pollId}')]
 	public function update(int $pollId, array $poll): JSONResponse {
 		return $this->response(fn () => [
@@ -194,6 +206,7 @@ public function update(int $pollId, array $poll): JSONResponse {
 	 * @param int $pollId Poll id
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'PUT', url: '/poll/{pollId}/lockAnonymous')]
 	public function lockAnonymous(int $pollId): JSONResponse {
 		return $this->response(fn () => [
@@ -206,6 +219,7 @@ public function lockAnonymous(int $pollId): JSONResponse {
 	 * @param int $pollId Poll id
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'POST', url: '/poll/{pollId}/confirmation')]
 	public function sendConfirmation(int $pollId): JSONResponse {
 		return $this->response(fn () => [
@@ -218,6 +232,7 @@ public function sendConfirmation(int $pollId): JSONResponse {
 	 * @param int $pollId Poll id
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'PUT', url: '/poll/{pollId}/toggleArchive')]
 	public function toggleArchive(int $pollId): JSONResponse {
 		return $this->response(fn () => [
@@ -230,6 +245,7 @@ public function toggleArchive(int $pollId): JSONResponse {
 	 * @param int $pollId Poll id
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'DELETE', url: '/poll/{pollId}')]
 	public function delete(int $pollId): JSONResponse {
 		return $this->response(fn () => [
@@ -242,6 +258,7 @@ public function delete(int $pollId): JSONResponse {
 	 * @param int $pollId Poll id
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'PUT', url: '/poll/{pollId}/close')]
 	public function close(int $pollId): JSONResponse {
 		return $this->response(fn () => [
@@ -254,6 +271,7 @@ public function close(int $pollId): JSONResponse {
 	 * @param int $pollId Poll id
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'PUT', url: '/poll/{pollId}/reopen')]
 	public function reopen(int $pollId): JSONResponse {
 		return $this->response(fn () => [
@@ -284,6 +302,7 @@ private function clonePoll(int $pollId): Poll {
 	 * @param string $sourceUserId User id to transfer polls from
 	 * @param string $targetUserId User id to transfer polls to
 	 */
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'PUT', url: '/poll/transfer/{sourceUserId}/{targetUserId}')]
 	public function transferPolls(string $sourceUserId, string $targetUserId): JSONResponse {
 		return $this->response(fn () => $this->pollService->transferPolls($sourceUserId, $targetUserId));
@@ -295,6 +314,7 @@ public function transferPolls(string $sourceUserId, string $targetUserId): JSONR
 	 * @param string $targetUserId User to transfer polls to
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'PUT', url: '/poll/{pollId}/changeowner/{targetUserId}')]
 	public function changeOwner(int $pollId, string $targetUserId): JSONResponse {
 		return $this->response(fn () => $this->pollService->transferPoll($pollId, $targetUserId));
@@ -305,8 +325,23 @@ public function changeOwner(int $pollId, string $targetUserId): JSONResponse {
 	 * @param int $pollId Poll id
 	 */
 	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
 	#[FrontpageRoute(verb: 'GET', url: '/poll/{pollId}/addresses')]
 	public function getParticipantsEmailAddresses(int $pollId): JSONResponse {
 		return $this->response(fn () => $this->pollService->getParticipantsEmailAddresses($pollId));
 	}
+
+	/**
+	 * Delete orphaned votes
+	 * @param int $pollId poll id
+	 */
+	#[NoAdminRequired]
+	#[OpenAPI(OpenAPI::SCOPE_IGNORE)]
+	#[FrontpageRoute(verb: 'DELETE', url: '/poll/{pollId}/votes/orphaned/all')]
+	public function deleteOrphaned(int $pollId): JSONResponse {
+		return $this->response(fn () => [
+			'deleted' => $this->voteService->deleteOrphanedVotes($pollId)
+		]);
+	}
+
 }
diff --git a/lib/Controller/PublicController.php b/lib/Controller/PublicController.php
index a828171d3c..fc3ceb6be8 100644
--- a/lib/Controller/PublicController.php
+++ b/lib/Controller/PublicController.php
@@ -94,6 +94,7 @@ public function getPoll(): JSONResponse {
 				'poll' => $this->pollService->get($this->userSession->getShare()->getPollId()),
 				'options' => $this->optionService->list($this->userSession->getShare()->getPollId()),
 				'votes' => $this->voteService->list($this->userSession->getShare()->getPollId()),
+				'orphaned' => 0,
 				'comments' => $this->commentService->list($this->userSession->getShare()->getPollId()),
 				'shares' => $this->shareService->list($this->userSession->getShare()->getPollId()),
 				'subscribed' => $this->subscriptionService->get($this->userSession->getShare()->getPollId()),
diff --git a/lib/Db/VoteMapper.php b/lib/Db/VoteMapper.php
index 00a52520dc..f669a02c45 100644
--- a/lib/Db/VoteMapper.php
+++ b/lib/Db/VoteMapper.php
@@ -154,6 +154,26 @@ public function findOrphanedByPollandUser(int $pollId, string $userId): array {
 		return $this->findEntities($qb);
 	}
 
+	/**
+	 * @throws \OCP\AppFramework\Db\DoesNotExistException if not found
+	 * @return Vote[]
+	 * @psalm-return array<array-key, Vote>
+	 */
+	public function findOrphanedByPoll(int $pollId): array {
+		$qb = $this->db->getQueryBuilder();
+
+		$qb->select(self::TABLE . '.*')
+			->where($qb->expr()->isNotNull(self::TABLE . '.poll_id'))
+			->from($this->getTableName(), self::TABLE)
+			->groupBy(self::TABLE . '.id');
+
+		$optionAlias = $this->joinOption($qb, self::TABLE);
+
+		$qb->andWhere($qb->expr()->isNull($optionAlias . '.id'));
+		$qb->andWhere($qb->expr()->eq(self::TABLE . '.poll_id', $qb->createNamedParameter($pollId, IQueryBuilder::PARAM_INT)));
+		return $this->findEntities($qb);
+	}
+
 	/**
 	 * Build the enhanced query with joined tables
 	 */
diff --git a/lib/Event/VoteDeletedOrphanedEvent.php b/lib/Event/VoteDeletedOrphanedEvent.php
new file mode 100644
index 0000000000..56605fc59a
--- /dev/null
+++ b/lib/Event/VoteDeletedOrphanedEvent.php
@@ -0,0 +1,21 @@
+<?php
+
+/**
+ * SPDX-FileCopyrightText: 2021 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+namespace OCA\Polls\Event;
+
+use OCA\Polls\Db\Vote;
+
+class VoteDeletedOrphanedEvent extends VoteEvent {
+	public function __construct(
+		protected Vote $vote,
+		protected bool $log = true,
+	) {
+		parent::__construct($vote);
+		$this->log = $log;
+		$this->eventId = self::DELETED_ORPHANED;
+	}
+}
diff --git a/lib/Event/VoteEvent.php b/lib/Event/VoteEvent.php
index 9065f6b3ec..a1c8f7a34b 100644
--- a/lib/Event/VoteEvent.php
+++ b/lib/Event/VoteEvent.php
@@ -14,6 +14,7 @@
  */
 abstract class VoteEvent extends BaseEvent {
 	public const SET = 'vote_set';
+	public const DELETED_ORPHANED = 'vote_deleted_orphaned';
 
 	public function __construct(
 		protected Vote $vote,
diff --git a/lib/Service/ActivityService.php b/lib/Service/ActivityService.php
index 2c1c6bec29..acbdf8bb44 100644
--- a/lib/Service/ActivityService.php
+++ b/lib/Service/ActivityService.php
@@ -242,6 +242,12 @@ private function getMatchedMessages(): array {
 				self::FIRST_PERSON_FILTERED => $this->l10n->t('You have voted'),
 				self::THIRD_PERSON_FILTERED => $this->l10n->t('{actor} has voted'),
 			],
+			VoteEvent::DELETED_ORPHANED => [
+				self::FIRST_PERSON_FULL => $this->l10n->t('One or more orphaned votes heve been deleted from {pollTitle}'),
+				self::THIRD_PERSON_FULL => $this->l10n->t('{actor} has deleted your orphaned polls from poll {pollTitle}'),
+				self::FIRST_PERSON_FILTERED => $this->l10n->t('Orphaned votes deleted'),
+				self::THIRD_PERSON_FILTERED => $this->l10n->t('{actor} deleted orphaned votes'),
+			],
 			ShareEvent::LOCKED => [
 				self::FIRST_PERSON_FULL => $this->l10n->t('You have locked the share of {sharee}'),
 				self::THIRD_PERSON_FULL => $this->l10n->t('{actor} has locked the share of {sharee}'),
diff --git a/lib/Service/VoteService.php b/lib/Service/VoteService.php
index 38b4f19bb8..436ae0c590 100644
--- a/lib/Service/VoteService.php
+++ b/lib/Service/VoteService.php
@@ -14,6 +14,7 @@
 use OCA\Polls\Db\PollMapper;
 use OCA\Polls\Db\Vote;
 use OCA\Polls\Db\VoteMapper;
+use OCA\Polls\Event\VoteDeletedOrphanedEvent;
 use OCA\Polls\Event\VoteSetEvent;
 use OCA\Polls\Exceptions\NotFoundException;
 use OCA\Polls\Exceptions\VoteLimitExceededException;
@@ -130,6 +131,41 @@ public function set(Option|int $optionOrOptionIdoptionId, string $setTo): ?Vote
 		return $this->vote;
 	}
 
+	/**
+	 * Get all votes of a poll, which are not assigned to an option
+	 *
+	 * @param int $pollId poll id of the poll the votes get deleted from
+	 * @return Vote[]
+	 */
+	public function getOprhanedVotes(int $pollId): array {
+		$poll = $this->pollMapper->get($pollId, withRoles: true);
+		$poll->request(Poll::PERMISSION_POLL_EDIT);
+
+		// get all votes of the poll, which are not assigned to an option
+		return $this->voteMapper->findOrphanedByPoll($pollId);
+	}
+
+	/**
+	 * Delete all votes of a poll, which are not assigned to an option
+	 *
+	 * @param int $pollId poll id of the poll the votes get deleted from
+	 * @return Vote[]
+	 */
+	public function deleteOrphanedVotes(int $pollId): array {
+		$poll = $this->pollMapper->get($pollId, withRoles: true);
+		$poll->request(Poll::PERMISSION_VOTE_FOREIGN_CHANGE);
+
+		// delete all votes of the poll, which are not assigned to an option
+		$votes = $this->voteMapper->findOrphanedByPoll($pollId);
+		foreach ($votes as $vote) {
+			$this->voteMapper->delete($vote);
+			// TODO: rework notification methods
+			// keep this dispatch as reminder
+			// $this->eventDispatcher->dispatchTyped(new VoteDeletedOrphanedEvent($this->vote, false));
+		}
+		return $votes;
+	}
+
 	/**
 	 * Remove user from poll
 	 *

From fcb877a1c81fd8da6341eed625af9b0d23904bc6 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 21 Jul 2025 23:02:32 +0200
Subject: [PATCH 4/9] delete orphaned votes from poll  (Frontend)

Signed-off-by: dartcafe <github@dartcafe.de>
---
 src/Api/modules/api.types.ts                  | 36 ++++++++++++++++
 src/Api/modules/polls.ts                      | 30 ++++++-------
 src/Api/modules/public.ts                     | 37 +++++-----------
 src/Api/modules/votes.ts                      | 11 ++---
 .../Configuration/ConfigDangerArea.vue        | 42 +++++++++++++++++--
 src/stores/poll.ts                            | 18 ++++++++
 6 files changed, 124 insertions(+), 50 deletions(-)
 create mode 100644 src/Api/modules/api.types.ts

diff --git a/src/Api/modules/api.types.ts b/src/Api/modules/api.types.ts
new file mode 100644
index 0000000000..39db149188
--- /dev/null
+++ b/src/Api/modules/api.types.ts
@@ -0,0 +1,36 @@
+/**
+ * SPDX-FileCopyrightText: 2025 Nextcloud contributors
+ * SPDX-License-Identifier: AGPL-3.0-or-later
+ */
+
+import { Comment, Option, Poll, Share, Vote } from '../../Types'
+
+export type FullPollResponse = {
+	poll: Poll
+	options: Option[]
+	votes: Vote[]
+	orphaned: number
+	comments: Comment[]
+	shares: Share[]
+	subscribed: boolean
+}
+
+export type AddOptionResponse = {
+	option: Option
+	repetitions: Option[]
+	options: Option[]
+	votes: Vote[]
+}
+
+export type setVoteResponse = {
+	vote: Vote
+	poll: Poll
+	options: Option[]
+	votes: Vote[]
+}
+
+export type RemoveVotesResponse = {
+	poll: Poll
+	options: Option[]
+	votes: Vote[]
+}
diff --git a/src/Api/modules/polls.ts b/src/Api/modules/polls.ts
index 34ea73ff92..ea32f171ee 100644
--- a/src/Api/modules/polls.ts
+++ b/src/Api/modules/polls.ts
@@ -5,11 +5,9 @@
 import { Poll, PollConfiguration, PollType } from '../../stores/poll.ts'
 import { AxiosResponse } from '@nextcloud/axios'
 import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { Option } from '../../stores/options.ts'
-import { Vote } from '../../stores/votes.ts'
-import { Share } from '../../stores/shares.ts'
-import { ApiEmailAdressList, Comment } from '../../Types/index.ts'
+import { ApiEmailAdressList, Vote } from '../../Types/index.ts'
 import { PollGroup } from '../../stores/pollGroups.types.ts'
+import { FullPollResponse } from './api.types.ts'
 
 export type Confirmations = {
 	sentMails: { emailAddress: string; displayName: string }[]
@@ -52,16 +50,7 @@ const polls = {
 		})
 	},
 
-	getFullPoll(pollId: number): Promise<
-		AxiosResponse<{
-			poll: Poll
-			options: Option[]
-			votes: Vote[]
-			comments: Comment[]
-			shares: Share[]
-			subscribed: boolean
-		}>
-	> {
+	getFullPoll(pollId: number): Promise<AxiosResponse<FullPollResponse>> {
 		return httpInstance.request({
 			method: 'GET',
 			url: `poll/${pollId}`,
@@ -150,6 +139,19 @@ const polls = {
 		})
 	},
 
+	removeOrphanedVotes(
+		pollId: number,
+	): Promise<AxiosResponse<{ deleted: Vote[] }>> {
+		return httpInstance.request({
+			method: 'DELETE',
+			url: `poll/${pollId}/votes/orphaned/all`,
+			cancelToken:
+				cancelTokenHandlerObject[
+					this.removeOrphanedVotes.name
+				].handleRequestCancellation().token,
+		})
+	},
+
 	closePoll(pollId: number): Promise<AxiosResponse<{ poll: Poll }>> {
 		return httpInstance.request({
 			method: 'PUT',
diff --git a/src/Api/modules/public.ts b/src/Api/modules/public.ts
index 85c0bde2b3..1e7d02e710 100644
--- a/src/Api/modules/public.ts
+++ b/src/Api/modules/public.ts
@@ -8,21 +8,17 @@ import { Session } from '../../stores/session.js'
 import { Answer, Vote } from '../../stores/votes.js'
 import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
 import { Comment } from '../../stores/comments.js'
-import { Poll } from '../../stores/poll.js'
 import { Share } from '../../stores/shares.js'
 import { SentResults } from './shares.js'
+import {
+	AddOptionResponse,
+	FullPollResponse,
+	RemoveVotesResponse,
+	setVoteResponse,
+} from './api.types.js'
 
 const publicPoll = {
-	getPoll(shareToken: string): Promise<
-		AxiosResponse<{
-			poll: Poll
-			options: Option[]
-			votes: Vote[]
-			comments: Comment[]
-			shares: Share[]
-			subscribed: boolean
-		}>
-	> {
+	getPoll(shareToken: string): Promise<AxiosResponse<FullPollResponse>> {
 		return httpInstance.request({
 			method: 'GET',
 			url: `/s/${shareToken}/poll`,
@@ -63,14 +59,7 @@ const publicPoll = {
 		option: SimpleOption,
 		sequence: Sequence | null,
 		voteYes: boolean = false,
-	): Promise<
-		AxiosResponse<{
-			option: Option
-			repetitions: Option[]
-			options: Option[]
-			votes: Vote[]
-		}>
-	> {
+	): Promise<AxiosResponse<AddOptionResponse>> {
 		return httpInstance.request({
 			method: 'POST',
 			url: `/s/${shareToken}/option`,
@@ -129,9 +118,7 @@ const publicPoll = {
 		shareToken: string,
 		optionId: number,
 		setTo: Answer,
-	): Promise<
-		AxiosResponse<{ vote: Vote; poll: Poll; options: Option[]; votes: Vote[] }>
-	> {
+	): Promise<AxiosResponse<setVoteResponse>> {
 		return httpInstance.request({
 			method: 'PUT',
 			url: `s/${shareToken}/vote`,
@@ -146,9 +133,7 @@ const publicPoll = {
 		})
 	},
 
-	resetVotes(
-		shareToken: string,
-	): Promise<AxiosResponse<{ poll: Poll; options: Option[]; votes: Vote[] }>> {
+	resetVotes(shareToken: string): Promise<AxiosResponse<RemoveVotesResponse>> {
 		return httpInstance.request({
 			method: 'DELETE',
 			url: `s/${shareToken}/user`,
@@ -161,7 +146,7 @@ const publicPoll = {
 
 	removeOrphanedVotes(
 		shareToken: string,
-	): Promise<AxiosResponse<{ poll: Poll; options: Option[]; votes: Vote[] }>> {
+	): Promise<AxiosResponse<RemoveVotesResponse>> {
 		return httpInstance.request({
 			method: 'DELETE',
 			url: `s/${shareToken}/votes/orphaned`,
diff --git a/src/Api/modules/votes.ts b/src/Api/modules/votes.ts
index e408996031..0861930add 100644
--- a/src/Api/modules/votes.ts
+++ b/src/Api/modules/votes.ts
@@ -5,8 +5,7 @@
 import { AxiosResponse } from '@nextcloud/axios'
 import { Answer, Vote } from '../../stores/votes.js'
 import { httpInstance, createCancelTokenHandler } from './HttpApi.js'
-import { Option } from '../../stores/options.js'
-import { Poll } from '../../stores/poll.js'
+import { RemoveVotesResponse, setVoteResponse } from './api.types.js'
 
 const votes = {
 	getVotes(pollId: number): Promise<AxiosResponse<{ votes: Vote[] }>> {
@@ -24,9 +23,7 @@ const votes = {
 	setVote(
 		optionId: number,
 		setTo: Answer,
-	): Promise<
-		AxiosResponse<{ vote: Vote; poll: Poll; options: Option[]; votes: Vote[] }>
-	> {
+	): Promise<AxiosResponse<setVoteResponse>> {
 		return httpInstance.request({
 			method: 'PUT',
 			url: 'vote',
@@ -44,7 +41,7 @@ const votes = {
 	resetVotes(
 		pollId: number,
 		userId: string | null = null,
-	): Promise<AxiosResponse<{ poll: Poll; options: Option[]; votes: Vote[] }>> {
+	): Promise<AxiosResponse<RemoveVotesResponse>> {
 		return httpInstance.request({
 			method: 'DELETE',
 			url: userId ? `poll/${pollId}/user/${userId}` : `poll/${pollId}/user`,
@@ -57,7 +54,7 @@ const votes = {
 
 	removeOrphanedVotes(
 		pollId: number,
-	): Promise<AxiosResponse<{ poll: Poll; options: Option[]; votes: Vote[] }>> {
+	): Promise<AxiosResponse<RemoveVotesResponse>> {
 		return httpInstance.request({
 			method: 'DELETE',
 			url: `poll/${pollId}/votes/orphaned`,
diff --git a/src/components/Configuration/ConfigDangerArea.vue b/src/components/Configuration/ConfigDangerArea.vue
index c2ae5dbe42..a1b17d3ba8 100644
--- a/src/components/Configuration/ConfigDangerArea.vue
+++ b/src/components/Configuration/ConfigDangerArea.vue
@@ -4,10 +4,10 @@
 -->
 
 <script setup lang="ts">
-import { ref } from 'vue'
+import { computed, ref } from 'vue'
 import { router } from '../../router.ts'
-import { t } from '@nextcloud/l10n'
-import { showError } from '@nextcloud/dialogs'
+import { n, t } from '@nextcloud/l10n'
+import { showError, showSuccess } from '@nextcloud/dialogs'
 import NcButton from '@nextcloud/vue/components/NcButton'
 
 import { usePollStore } from '../../stores/poll.ts'
@@ -17,6 +17,7 @@ import RestorePollIcon from 'vue-material-design-icons/Recycle.vue'
 import ArchivePollIcon from 'vue-material-design-icons/Archive.vue'
 import DeletePollIcon from 'vue-material-design-icons/Delete.vue'
 import TransferPollIcon from 'vue-material-design-icons/AccountSwitchOutline.vue'
+import DeleteOrphanedIcon from 'vue-material-design-icons/CloseBoxMultipleOutline.vue'
 import TransferPollDialog from '../Modals/TransferPollDialog.vue'
 
 const pollStore = usePollStore()
@@ -38,6 +39,26 @@ function toggleArchive() {
 	}
 }
 
+const showDeleteOrphaned = computed(
+	() =>
+		pollStore.status.orphanedVotes > 0
+		&& pollStore.permissions.changeForeignVotes,
+)
+async function deleteOrphaned() {
+	try {
+		const deleted = await pollStore.removeOrphanedVotes()
+		showSuccess(
+			n(
+				'polls',
+				'Removed %n orphaned vote',
+				'Removed %n orphaned votes',
+				deleted,
+			),
+		)
+	} catch {
+		showError(t('polls', 'Error deleting orphaned votes.'))
+	}
+}
 function routeAway() {
 	router.push({
 		name: 'list',
@@ -80,6 +101,21 @@ function routeAway() {
 				{{ t('polls', 'Transfer poll') }}
 			</template>
 		</NcButton>
+		<NcButton v-if="showDeleteOrphaned" @click="deleteOrphaned">
+			<template #icon>
+				<DeleteOrphanedIcon />
+			</template>
+			<template #default>
+				{{
+					n(
+						'polls',
+						'Remove orphaned vote',
+						'Remove %n orphaned votes',
+						pollStore.status.orphanedVotes,
+					)
+				}}
+			</template>
+		</NcButton>
 	</div>
 	<DeletePollDialog
 		v-model="showDeleteDialog"
diff --git a/src/stores/poll.ts b/src/stores/poll.ts
index 0aa0f5af23..1ca33004b2 100644
--- a/src/stores/poll.ts
+++ b/src/stores/poll.ts
@@ -93,6 +93,7 @@ export type PollStatus = {
 	deletionDate: number
 	archivedDate: number
 	countParticipants: number
+	orphanedVotes: number
 }
 
 export type PollPermissions = {
@@ -193,6 +194,7 @@ export const usePollStore = defineStore('poll', {
 			deletionDate: 0,
 			archivedDate: 0,
 			countParticipants: 0,
+			orphanedVotes: 0,
 		},
 		currentUserStatus: {
 			groupInvitations: [],
@@ -397,6 +399,7 @@ export const usePollStore = defineStore('poll', {
 				}
 
 				this.$patch(response.data.poll)
+				this.status.orphanedVotes = response.data.orphaned
 				votesStore.votes = response.data.votes
 				optionsStore.options = response.data.options
 				sharesStore.shares = response.data.shares
@@ -531,6 +534,21 @@ export const usePollStore = defineStore('poll', {
 			}
 		},
 
+		async removeOrphanedVotes(): Promise<number> {
+			try {
+				const response = await PollsAPI.removeOrphanedVotes(this.id)
+				this.status.orphanedVotes =
+					this.status.orphanedVotes - response.data.deleted.length
+				return response.data.deleted.length
+			} catch (error) {
+				if ((error as AxiosError)?.code === 'ERR_CANCELED') {
+					return 0
+				}
+				Logger.error('Error deleting orphaned votes', { error })
+				throw error
+			}
+		},
+
 		async toggleArchive(payload: { pollId: number }): Promise<void> {
 			const pollsStore = usePollsStore()
 

From ec1ceb0784ade0e816d37ff67c6cf0f0024a5251 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 21 Jul 2025 23:28:49 +0200
Subject: [PATCH 5/9] restore accidetally deleted method

Signed-off-by: dartcafe <github@dartcafe.de>
---
 lib/Controller/PollApiController.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/lib/Controller/PollApiController.php b/lib/Controller/PollApiController.php
index 344a3c1a4a..6469d4dd0a 100644
--- a/lib/Controller/PollApiController.php
+++ b/lib/Controller/PollApiController.php
@@ -209,4 +209,12 @@ public function deleteOrphaned(int $pollId): DataResponse {
 			'deleted' => $this->voteService->deleteOrphanedVotes($pollId)
 		]);
 	}
+
+	#[CORS]
+	#[NoAdminRequired]
+	#[NoCSRFRequired]
+	#[ApiRoute(verb: 'GET', url: '/api/v1.0/enum', requirements: ['apiVersion' => '(v2)'])]
+	public function enum(): DataResponse {
+		return $this->response(fn () => ['enum' => $this->pollService->getValidEnum()]);
+	}
 }

From 5aec6e288ccee139422425a59109ec5b4d4af6a5 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 21 Jul 2025 23:30:39 +0200
Subject: [PATCH 6/9] suppress PossiblyUnusedMethod

Signed-off-by: dartcafe <github@dartcafe.de>
---
 lib/Event/VoteDeletedOrphanedEvent.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/Event/VoteDeletedOrphanedEvent.php b/lib/Event/VoteDeletedOrphanedEvent.php
index 56605fc59a..751e2f294a 100644
--- a/lib/Event/VoteDeletedOrphanedEvent.php
+++ b/lib/Event/VoteDeletedOrphanedEvent.php
@@ -10,6 +10,9 @@
 use OCA\Polls\Db\Vote;
 
 class VoteDeletedOrphanedEvent extends VoteEvent {
+	/**
+	 * @psalm-suppress PossiblyUnusedMethod
+	 */
 	public function __construct(
 		protected Vote $vote,
 		protected bool $log = true,

From 4fc6b0dedf213ebca59bca96fa72ce12daa0e2c8 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 21 Jul 2025 23:34:31 +0200
Subject: [PATCH 7/9] changelog

Signed-off-by: dartcafe <github@dartcafe.de>
---
 CHANGELOG.md | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f0b72ddc0..0bfdffb8fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,9 +6,17 @@
 All notable changes to this project will be documented in this file.
 
 ## [unreleased]
-### changes
+### New
+ - Add option to delete orphaned votes
+
+### Changes
  - Make vote cell focusable
  - Make shadow of sticky items transparent
+ - Changed experimental comments layout
+
+### Fixes
+ - Force list view mode initially on mobile viewports
+ - Fix some viual issues of the vote page
 
 ## [8.1.4] - 2025-07-15
 ### Fixes
@@ -19,7 +27,7 @@ All notable changes to this project will be documented in this file.
  - Fixed visual bug when scrolling in list view
  - Fixed exception on notifications which may cause resending notification mails
 
-### changes
+### Changes
  - Center poll table
 
 ## [8.1.0] - 2025-07-13

From a16722f2f32bc38e02d37879628ee54226e223d8 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Mon, 21 Jul 2025 23:50:26 +0200
Subject: [PATCH 8/9] fix access check

Signed-off-by: dartcafe <github@dartcafe.de>
---
 lib/Service/VoteService.php | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/lib/Service/VoteService.php b/lib/Service/VoteService.php
index 436ae0c590..b40a051a02 100644
--- a/lib/Service/VoteService.php
+++ b/lib/Service/VoteService.php
@@ -16,6 +16,7 @@
 use OCA\Polls\Db\VoteMapper;
 use OCA\Polls\Event\VoteDeletedOrphanedEvent;
 use OCA\Polls\Event\VoteSetEvent;
+use OCA\Polls\Exceptions\ForbiddenException;
 use OCA\Polls\Exceptions\NotFoundException;
 use OCA\Polls\Exceptions\VoteLimitExceededException;
 use OCA\Polls\UserSession;
@@ -138,11 +139,13 @@ public function set(Option|int $optionOrOptionIdoptionId, string $setTo): ?Vote
 	 * @return Vote[]
 	 */
 	public function getOprhanedVotes(int $pollId): array {
-		$poll = $this->pollMapper->get($pollId, withRoles: true);
-		$poll->request(Poll::PERMISSION_POLL_EDIT);
-
-		// get all votes of the poll, which are not assigned to an option
-		return $this->voteMapper->findOrphanedByPoll($pollId);
+		try {
+			$poll = $this->pollMapper->get($pollId, withRoles: true);
+			$poll->request(Poll::PERMISSION_POLL_EDIT);
+			return $this->voteMapper->findOrphanedByPoll($pollId);
+		} catch (ForbiddenException $e) {
+			return [];
+		}
 	}
 
 	/**

From 8b8b3c70f8cae7bc783bd86ad8a3aa0e4bc71125 Mon Sep 17 00:00:00 2001
From: dartcafe <github@dartcafe.de>
Date: Tue, 22 Jul 2025 19:47:50 +0200
Subject: [PATCH 9/9] changelog

Signed-off-by: dartcafe <github@dartcafe.de>
---
 CHANGELOG.md | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0bfdffb8fa..c54ddaf0a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 ## [unreleased]
 ### New
  - Add option to delete orphaned votes
+ - Add vote indicator for locked options
 
 ### Changes
  - Make vote cell focusable
@@ -16,7 +17,8 @@ All notable changes to this project will be documented in this file.
 
 ### Fixes
  - Force list view mode initially on mobile viewports
- - Fix some viual issues of the vote page
+ - Fix some visual issues of the vote page
+ - Bring back indicator for confirmed options after closing the poll
 
 ## [8.1.4] - 2025-07-15
 ### Fixes