Merge pull request #3676 from nextcloud/fix/multiple-click-vote-item

fix: disable vote option while loading

lib/Controller/VoteController.php

@@ -8,6 +8,8 @@
 
 namespace OCA\Polls\Controller;
 
+use OCA\Polls\Service\OptionService;
+use OCA\Polls\Service\PollService;
 use OCA\Polls\Service\VoteService;
 use OCP\AppFramework\Http\Attribute\NoAdminRequired;
 use OCP\AppFramework\Http\Attribute\NoCSRFRequired;
@@ -21,7 +23,9 @@ class VoteController extends BaseController {
 	public function __construct(
 		string $appName,
 		IRequest $request,
-		private VoteService $voteService
+		private VoteService $voteService,
+		private PollService $pollService,
+		private OptionService $optionService,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -44,7 +48,12 @@ public function list(int $pollId): JSONResponse {
 	#[NoAdminRequired]
 	#[NoCSRFRequired]
 	public function set(int $optionId, string $setTo): JSONResponse {
-		return $this->response(fn () => ['vote' => $this->voteService->set($optionId, $setTo)]);
+		$option = $this->optionService->get($optionId);
+		return $this->response(fn () => [
+			'vote' => $this->voteService->set($optionId, $setTo),
+			'poll' => $this->pollService->get($option->getPollId()),
+			'options' => $this->optionService->list($option->getPollId()),
+		]);
 	}
 
 	/**

lib/Service/OptionService.php

@@ -47,6 +47,9 @@ public function __construct(
 		$this->options = [];
 	}
 
+	public function get(int $optionId): Option {
+		return $this->optionMapper->find($optionId);
+	}
 	/**
 	 * Get all options of given poll
 	 *

lib/Service/VoteService.php

@@ -72,16 +72,21 @@ public function set(int $optionId, string $setTo): ?Vote {
 		$option = $this->optionMapper->find($optionId);
 		$poll = $this->pollMapper->find($option->getPollId());
 		$poll->request(Poll::PERMISSION_VOTE_EDIT);
-
-		if ($setTo === Vote::VOTE_YES) {
-			$this->checkLimits($option);
-		}
-		//  delete no votes, if poll setting is set to useNo === 0
-		$deleteVoteInsteadOfNoVote = in_array(trim($setTo), [Vote::VOTE_NO, '']) && !boolval($poll->getUseNo());
 
 		try {
 			$this->vote = $this->voteMapper->findSingleVote($poll->getId(), $option->getPollOptionText(), $this->acl->getCurrentUserId());
 
+			if ($setTo === $this->vote->getVoteAnswer()) {
+				return $this->vote;
+			}
+
+			if ($setTo === Vote::VOTE_YES) {
+				$this->checkLimits($option);
+			}
+
+			//  delete no votes, if poll setting is set to useNo === 0
+			$deleteVoteInsteadOfNoVote = in_array(trim($setTo), [Vote::VOTE_NO, '']) && !boolval($poll->getUseNo());
+
 			if ($deleteVoteInsteadOfNoVote) {
 				$this->vote->setVoteAnswer('');
 				$this->voteMapper->delete($this->vote);

src/js/components/VoteTable/VoteItem.vue

@@ -103,7 +103,6 @@ export default {
 				showSuccess(t('polls', 'Vote saved'), { timeout: 2000 })
 			} catch (e) {
 				showError(t('polls', 'Error saving vote'))
-
 			}
 		},
 	},

src/js/store/modules/votes.js

@@ -101,14 +101,17 @@ const actions = {
 				response = await VotesAPI.setVote(payload.option.id, payload.setTo)
 			}
 			context.commit('setItem', { option: payload.option, pollId: context.rootState.poll.id, vote: response.data.vote })
-			context.dispatch('options/list', null, { root: true })
-			context.dispatch('poll/get', null, { root: true })
+			context.commit('options/set', { options: response.data.options }, { root: true })
+			context.commit('poll/set', { poll: response.data.poll }, { root: true })
+			// context.dispatch('options/list', null, { root: true })
+			// context.dispatch('poll/get', null, { root: true })
 			return response
 		} catch (error) {
 			if (error?.code === 'ERR_CANCELED') return
 			if (error.response.status === 409) {
 				context.dispatch('list')
 				context.dispatch('options/list', null, { root: true })
+				context.dispatch('poll/get', null, { root: true })
 			} else {
 				Logger.error('Error setting vote', { error, payload })
 				throw error