implemented PR suggestions

Author: Matin Gohar Far

src/api/votings.ts

@@ -1,5 +1,5 @@
-import {CreateVotingRequest} from "store/features/votings/types";
-import {SERVER_HTTP_URL} from "../config";
+import { CreateVotingRequest, VotingStatus } from "store/features/votings/types";
+import { SERVER_HTTP_URL } from "../config";
 
 export const VotingAPI = {
   /**
@@ -23,22 +23,21 @@ export const VotingAPI = {
 
       throw new Error(`create voting request resulted in response with status ${response.status}`);
     } catch (error) {
-      throw new Error(`unable to create voting`, {cause: error});
+      throw new Error(`unable to create voting`, { cause: error });
     }
   },
 
-  changeVotingStatus: async (board: string, voting: string, status?: string) => {
+  changeVotingStatus: async (board: string, voting: string, status?: VotingStatus) => {
     try {
+      const resolvedStatus: VotingStatus = typeof status === "undefined" || status === null ? "CLOSED" : status;
+
       const options: RequestInit = {
         method: "PUT",
         credentials: "include",
+        body: JSON.stringify({ status: resolvedStatus }),
+        headers: { "Content-Type": "application/json" },
       };
 
-      if (typeof status !== "undefined") {
-        options.body = JSON.stringify({status});
-        options.headers = {"Content-Type": "application/json"};
-      }
-
       const response = await fetch(`${SERVER_HTTP_URL}/boards/${board}/votings/${voting}`, options);
 
       if (response.status === 200) {
@@ -47,7 +46,7 @@ export const VotingAPI = {
 
       throw new Error(`change voting status request resulted in response with status ${response.status}`);
     } catch (error) {
-      throw new Error(`unable to change voting status`, {cause: error});
+      throw new Error(`unable to change voting status`, { cause: error });
     }
   },
 };

src/components/VotingDialog/VotingDialog.tsx

@@ -8,7 +8,7 @@ import { getNumberFromStorage, saveToStorage, getFromStorage } from "utils/stora
 import { CUMULATIVE_VOTING_DEFAULT_STORAGE_KEY, CUSTOM_NUMBER_OF_VOTES_STORAGE_KEY } from "constants/storage";
 import { PlusIcon, MinusIcon } from "components/Icon";
 import "./VotingDialog.scss";
-import { closeVoting, createVoting, cancelVoting } from "store/features";
+import { closeVoting, createVoting, abortVoting } from "store/features";
 
 export const VotingDialog = () => {
   const dispatch = useAppDispatch();
@@ -46,8 +46,8 @@ export const VotingDialog = () => {
     navigate("..");
   };
 
-  const abortVoting = () => {
-    dispatch(cancelVoting(voting!));
+  const abort_voting = () => {
+    dispatch(abortVoting(voting!));
     navigate("..");
   }
 
@@ -59,7 +59,7 @@ export const VotingDialog = () => {
             <label>{t("VoteConfigurationButton.stopVoting")}</label>
           </button>
 
-          <button className="voting-dialog__start-button voting-dialog__cancel-button" data-testid="voting-dialog__cancel-button" onClick={() => abortVoting()}>
+          <button className="voting-dialog__start-button voting-dialog__cancel-button" data-testid="voting-dialog__cancel-button" onClick={() => abort_voting()}>
             <label>{t("VoteConfigurationButton.cancelVoting")}</label>
           </button>
         </>

src/store/features/votings/thunks.ts

@@ -1,20 +1,20 @@
-import {createAsyncThunk} from "@reduxjs/toolkit";
-import {API} from "api";
-import {ApplicationState, retryable} from "store";
-import {CreateVotingRequest} from "./types";
+import { createAsyncThunk } from "@reduxjs/toolkit";
+import { API } from "api";
+import { ApplicationState, retryable } from "store";
+import { CreateVotingRequest } from "./types";
 
-export const createVoting = createAsyncThunk<void, CreateVotingRequest, {state: ApplicationState}>("votings/createVoting", async (payload, {dispatch, getState}) => {
+export const createVoting = createAsyncThunk<void, CreateVotingRequest, { state: ApplicationState }>("votings/createVoting", async (payload, { dispatch, getState }) => {
   const boardId = getState().board.data!.id;
 
   await retryable(
     () => API.createVoting(boardId, payload),
     dispatch,
-    () => createVoting({...payload}),
+    () => createVoting({ ...payload }),
     "createVoting"
   );
 });
 
-export const closeVoting = createAsyncThunk<void, string, {state: ApplicationState}>("votings/closeVoting", async (payload, {dispatch, getState}) => {
+export const closeVoting = createAsyncThunk<void, string, { state: ApplicationState }>("votings/closeVoting", async (payload, { dispatch, getState }) => {
   const boardId = getState().board.data!.id;
 
   await retryable(
@@ -25,13 +25,13 @@ export const closeVoting = createAsyncThunk<void, string, {state: ApplicationSta
   );
 });
 
-export const cancelVoting = createAsyncThunk<void, string, {state: ApplicationState}>("votings/cancelVoting", async (payload, {dispatch, getState}) => {
+export const abortVoting = createAsyncThunk<void, string, { state: ApplicationState }>("votings/abortVoting", async (payload, { dispatch, getState }) => {
   const boardId = getState().board.data!.id;
 
   await retryable(
     () => API.changeVotingStatus(boardId, payload, "ABORTED"),
     dispatch,
-    () => cancelVoting(payload),
-    "cancelVoting"
+    () => abortVoting(payload),
+    "abortVoting"
   );
 });