support nullable chosenRank

- don't parse chosenRank for non generic variant
- delegate to existing getChosenRank of getters
- set default table column chosen_rank to null
- set default chosenRank to json empty array

Signed-off-by: philippe lhardy <[email protected]>

Author: philippe lhardy

lib/Db/Poll.php

@@ -151,7 +151,7 @@ class Poll extends EntityWithUser implements JsonSerializable {
 	protected string $access = '';
 	protected int $anonymous = 0;
 	protected int $allowMaybe = 0;
-	protected string $chosenRank = '';
+	protected string $chosenRank = '[]';
 	protected string $allowProposals = '';
 	protected int $proposalsExpire = 0;
 	protected int $voteLimit = 0;

lib/Migration/V2/TableSchema.php

@@ -247,7 +247,7 @@ abstract class TableSchema {
 			'access' => ['type' => Types::STRING, 'options' => ['notnull' => true, 'default' => 'private', 'length' => 1024]],
 			'anonymous' => ['type' => Types::BIGINT, 'options' => ['notnull' => true, 'default' => 0, 'length' => 20]],
 			'allow_maybe' => ['type' => Types::BIGINT, 'options' => ['notnull' => true, 'default' => 1, 'length' => 20]],
-			'chosen_rank' => ['type' => Types::TEXT, 'options' => ['notnull' => false, 'default' => '', 'length' => 200]],
+			'chosen_rank' => ['type' => Types::TEXT, 'options' => ['notnull' => false, 'default' => null, 'length' => 200]],
 			'allow_proposals' => ['type' => Types::STRING, 'options' => ['notnull' => true, 'default' => 'disallow', 'length' => 64]],
 			'proposals_expire' => ['type' => Types::BIGINT, 'options' => ['notnull' => true, 'default' => 0, 'length' => 20]],
 			'vote_limit' => ['type' => Types::BIGINT, 'options' => ['notnull' => true, 'default' => 0, 'length' => 20]],

src/components/VoteTable/VoteButton.vue

@@ -48,7 +48,8 @@ const vote = computed(() =>
 	}),
 )
 
-const chosenRank = JSON.parse(pollStore.configuration.chosenRank)
+const chosenRank =
+	pollStore.votingVariant === 'generic' ? pollStore.getChosenRank : null
 
 const nextAnswer = computed<richAnswer>(() => {
 	if (['no', ''].includes(vote.value.answer)) {

src/stores/poll.ts

@@ -151,7 +151,7 @@ export const usePollStore = defineStore('poll', {
 		getChosenRank(): string[] {
 			try {
 				const parsed = JSON.parse(this.configuration.chosenRank || '[]')
-				return Array.isArray(parsed) ? parsed : []
+				return Array.isArray(parsed) ? parsed : DEFAULT_CHOSEN_RANK
 			} catch {
 				return DEFAULT_CHOSEN_RANK
 			}