Merge pull request #4040 from nextcloud/fix/misc

Some minor fixes and tidy

Author: dartcafe

lib/Controller/PollController.php

@@ -98,7 +98,9 @@ public function getFull(int $pollId): JSONResponse {
 	#[FrontpageRoute(verb: 'POST', url: '/poll/add')]
 	public function add(string $type, string $title, string $votingVariant = Poll::VARIANT_SIMPLE): JSONResponse {
 		return $this->response(
-			fn () => $this->pollService->add($type, $title, $votingVariant),
+			fn () => [
+				'poll' => $this->pollService->add($type, $title, $votingVariant)
+			],
 			Http::STATUS_CREATED
 		);
 	}
@@ -147,7 +149,9 @@ public function sendConfirmation(int $pollId): JSONResponse {
 	#[NoAdminRequired]
 	#[FrontpageRoute(verb: 'PUT', url: '/poll/{pollId}/toggleArchive')]
 	public function toggleArchive(int $pollId): JSONResponse {
-		return $this->response(fn () => $this->pollService->toggleArchive($pollId));
+		return $this->response(fn () => [
+			'poll' => $this->pollService->toggleArchive($pollId)
+		]);
 	}
 
 	/**
@@ -157,7 +161,9 @@ public function toggleArchive(int $pollId): JSONResponse {
 	#[NoAdminRequired]
 	#[FrontpageRoute(verb: 'DELETE', url: '/poll/{pollId}')]
 	public function delete(int $pollId): JSONResponse {
-		return $this->response(fn () => ['poll' => $this->pollService->delete($pollId)]);
+		return $this->response(fn () => [
+			'poll' => $this->pollService->delete($pollId)
+		]);
 	}
 
 	/**
@@ -191,7 +197,9 @@ public function reopen(int $pollId): JSONResponse {
 	#[NoAdminRequired]
 	#[FrontpageRoute(verb: 'POST', url: '/poll/{pollId}/clone')]
 	public function clone(int $pollId): JSONResponse {
-		return $this->response(fn () => ['poll' => $this->clonePoll($pollId)]);
+		return $this->response(fn () => [
+			'poll' => $this->clonePoll($pollId)
+		]);
 	}
 
 	private function clonePoll(int $pollId): Poll {

src/stores/poll.ts

@@ -572,7 +572,10 @@ export const usePollStore = defineStore('poll', {
 			const pollsStore = usePollsStore()
 
 			try {
-				await PollsAPI.toggleArchive(payload.pollId)
+				const response = await PollsAPI.toggleArchive(payload.pollId)
+				if (this.id === payload.pollId) {
+					this.$patch(response.data.poll)
+				}
 			} catch (error) {
 				if ((error as AxiosError)?.code === 'ERR_CANCELED') {
 					return

src/views/Reference.vue

@@ -32,15 +32,7 @@ interface Props {
 }
 
 const { richObject } = defineProps<Props>()
-// const expiryClass2 = (() => {
-// 	if (!richObject?.poll?.expiry) {
-// 		return ''
-// 	}
-// 	if (DateTime.fromMillis(richObject.poll.expiry * 1000).diffNow('hours').hours < 36) {
-// 		return StatusResults.Warning
-// 	}
-// 	return StatusResults.Success
-// })
+
 const expiryClass = richObject?.poll?.expiry
 	? DateTime.fromMillis(richObject.poll.expiry * 1000).diffNow('hours').hours < 36
 		? StatusResults.Warning
@@ -80,12 +72,6 @@ const expiryClass = richObject?.poll?.expiry
 			<NcUserBubble
 				:user="richObject.poll.ownerId"
 				:display-name="richObject.poll.ownerDisplayName" />
-			<span
-				v-if="richObject.poll.expiry > 0 && !richObject.poll.expired"
-				class="expiration">
-				{{ t('polls', 'Ends in') }}
-				{{ DateTime.fromMillis(richObject.poll.expiry * 1000).toRelative() }}
-			</span>
 		</div>
 	</div>
 </template>