Refactor Poll related components and methods for better readability a…

…nd error handling
FriendsOfFlarum · Feb 19, 2024 · 2b204a7 · 2b204a7
1 parent 13001fe
commit 2b204a7
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 194 deletions.
diff --git a/js/dist/forum.js b/js/dist/forum.js
diff --git a/js/dist/forum.js.map b/js/dist/forum.js.map
diff --git a/js/src/forum/components/Poll.tsx b/js/src/forum/components/Poll.tsx
@@ -34,8 +34,12 @@ export default class Poll extends Component<PollAttrs, PollState> {
     const state = this.state;
     const controls = PollControls.controls(poll, this);
 
-    controls.add('view', (<Button onclick={state.showVoters} icon="fas fa-poll">{t('fof-polls.forum.public_poll')}</Button>));
-
+    controls.add(
+      'view',
+      <Button onclick={state.showVoters} icon="fas fa-poll">
+        {t('fof-polls.forum.public_poll')}
+      </Button>
+    );
 
     return (
       <div className="Poll" data-id={poll.id()}>

diff --git a/js/src/forum/models/Poll.ts b/js/src/forum/models/Poll.ts
@@ -68,8 +68,9 @@ export default class Poll extends Model {
     return Model.hasMany<PollVote>('votes').call(this);
   }
 
-  myVotes() {
-    return Model.hasMany<PollVote>('myVotes').call(this);
+  myVotes(): PollVote[] {
+    const myVotes = Model.hasMany<PollVote>('myVotes').call(this);
+    return myVotes ? (myVotes as PollVote[]) : [];
   }
 
   isGlobal() {

diff --git a/js/src/forum/states/PollDirectoryState.ts b/js/src/forum/states/PollDirectoryState.ts
diff --git a/js/src/forum/states/PollState.ts b/js/src/forum/states/PollState.ts
@@ -12,14 +12,13 @@ export default class PollState {
   public loadingOptions: boolean;
   public useSubmitUI: boolean;
   public showCheckMarks: boolean;
-  public boundChangeVote: (option: PollOption, evt: Event) => void;
 
   constructor(poll: Poll) {
     this.poll = poll;
     this.pendingSubmit = false;
     this.pendingOptions = null;
     this.loadingOptions = false;
-    this.useSubmitUI = !this.poll?.canChangeVote() && this.poll?.allowMultipleVotes();
+    this.useSubmitUI = !poll?.canChangeVote() && poll?.allowMultipleVotes();
     this.showCheckMarks = !app.session.user || (!poll.hasEnded() && poll.canVote() && (!this.hasVoted() || poll.canChangeVote()));
   }
 
@@ -31,15 +30,17 @@ export default class PollState {
     return this.useSubmitUI && this.pendingSubmit;
   }
 
-  changeVote(option: PollOption, evt) {
+  changeVote(option: PollOption, evt: Event) {
+    const target = evt.target as HTMLInputElement;
+
     if (!app.session.user) {
       app.modal.show(LogInModal);
-      evt.target.checked = false;
+      target.checked = false;
       return;
     }
 
-    const optionIds = this.pendingOptions || new Set(this.poll.myVotes().map?.((v: PollVote) => v.option().id()));
-    const isUnvoting = optionIds.delete(option.id());
+    const optionIds = this.pendingOptions || new Set(this.poll.myVotes().map((v: PollVote) => v.option().id()));
+    const isUnvoting = optionIds.delete(option.id()!);
     const allowsMultiple = this.poll.allowMultipleVotes();
 
     if (!allowsMultiple) {
@@ -56,7 +57,7 @@ export default class PollState {
       return;
     }
 
-    return this.submit(optionIds, null, () => (evt.target.checked = isUnvoting));
+    return this.submit(optionIds, null, () => (target.checked = isUnvoting));
   }
 
   onsubmit() {