tmp

Author: roman-drozd-it

src/components/countdowntimer/CountdownTimer.tsx

@@ -66,7 +66,7 @@ const CountdownTimer = () : JSX.Element => {
 						InputLabelProps={{ shrink: true }}
 						inputProps={{ step: '1' }}
 						onChange={(e) => {
-							dispatch(countdownTimerActions.setCountdownTimer(e.target.value));
+							dispatch(countdownTimerActions.setCountdownTimerInitialTime(e.target.value));
 						}}
 						onKeyDown={(e) => {
 							if (remainingTime !== '00:00:00') {
@@ -88,7 +88,7 @@ const CountdownTimer = () : JSX.Element => {
 						size='small'
 						disabled={ !isEnabled || (isStarted || remainingTime === '00:00:00') }
 						onClick={() => {
-							dispatch(countdownTimerActions.setCountdownTimer('00:00:00'));
+							dispatch(countdownTimerActions.setCountdownTimerInitialTime('00:00:00'));
 						}}
 					>
 						<HighlightOffIcon />

src/store/actions/countdownTimerActions.tsx

@@ -79,20 +79,21 @@ AppThunk<Promise<void>> => async (
 	}
 };
 
-export const setCountdownTimer = (remainingTime : string): 
+export const setCountdownTimerInitialTime = (time : string): 
 AppThunk<Promise<void>> => async (
 	dispatch,
 	getState,
 	{ signalingService }
 ): Promise<void> => {
-	logger.debug('setCountdownTimer() [remainingTime:"%s"]', remainingTime);
+	logger.debug('setCountdownTimerInitialTime() [time:"%s"]', time);
 
 	try {
-		await signalingService.sendRequest('moderator:setCountdownTimer', { remainingTime });
+		
+		signalingService.sendRequest('moderator:setCountdownTimerInitialTime', time);
 
-		dispatch(countdownTimerActions.setCountdownTimer({ remainingTime, isStarted: false }));
-
-		dispatch(countdownTimerActions.setCountdownTimerInitialTime({ initialTime: remainingTime, isStarted: false }));
+		dispatch(countdownTimerActions.setCountdownTimerRemainingTime(time));
+		
+		dispatch(countdownTimerActions.setCountdownTimerInitialTime(time));
 
 	} catch (error) {
 		logger.error('setCountdownTimer() [error:"%o"]', error);

src/store/actions/roomActions.tsx

@@ -82,8 +82,7 @@ export const joinRoom = (): AppThunk<Promise<void>> => async (
 		dispatch(lobbyPeersActions.addPeers(lobbyPeers));
 		dispatch(roomSessionsActions.addMessages({ sessionId, messages: chatHistory }));
 		dispatch(roomSessionsActions.addFiles({ sessionId, files: fileHistory }));
-		dispatch(countdownTimerActions.setCountdownTimer(countdownTimer));
-		dispatch(countdownTimerActions.setCountdownTimerInitialTime(countdownTimer));
+		dispatch(countdownTimerActions.joinCountdownTimer(countdownTimer));
 
 		dispatch(countdownTimer.isStarted ? 
 			countdownTimerActions.startCountdownTimer() : 

src/store/middlewares/countdownTimerMiddleware.tsx

@@ -52,25 +52,20 @@ const createCountdownTimerMiddleware = ({
 								break;
 							}
 
-							case 'moderator:hasSetCountdownTimer': {
+							case 'moderator:settedCountdownTimerInitialTime': {
 
-								const { remainingTime, initialTime, isStarted } = notification.data;
-		
-								dispatch(countdownTimerActions.setCountdownTimer(
-									{ remainingTime, isStarted }));
-
-								dispatch(countdownTimerActions.setCountdownTimerInitialTime(
-									{ initialTime, isStarted }));
+								const time = notification.data;
 
+								dispatch(countdownTimerActions.setCountdownTimerInitialTime(time));
+								
 								break;
 							}
 
-							case 'moderator:updatedCountdownTimer': {
+							case 'moderator:settedCountdownTimerRemainingTime': {
 
-								const { remainingTime, isStarted } = notification.data;
+								const time = notification.data;
 
-								dispatch(countdownTimerActions.setCountdownTimer(
-									{ remainingTime, isStarted }));
+								dispatch(countdownTimerActions.setCountdownTimerRemainingTime(time));
 
 								break;
 							}

src/store/slices/countdownTimerSlice.tsx

@@ -30,11 +30,21 @@ const countdownTimerSlice = createSlice({
 		stopCountdownTimer: ((state) => {
 			state.isStarted = false;
 		}),
-		setCountdownTimer: ((state, action: PayloadAction<any>) => {
-			state.remainingTime = action.payload.remainingTime;
+		setCountdownTimerRemainingTime: ((state, action: PayloadAction<any>) => {
+			
+			const time = action.payload;
+
+			state.remainingTime = time;
 		}),
 		setCountdownTimerInitialTime: ((state, action: PayloadAction<any>) => {
+
+			const time = action.payload;
+			
+			state.initialTime = time;
+		}),
+		joinCountdownTimer: ((state, action: PayloadAction<any>) => {
 			state.initialTime = action.payload.initialTime;
+			state.remainingTime = action.payload.remainingTime;
 		}),
 	}
 });

src/views/room/Room.tsx

@@ -55,7 +55,7 @@ const Room = (): JSX.Element => {
 
 				const remainingTimeString = moment.unix(remainingTimeUnix).format('HH:mm:ss');
 
-				dispatch(countdownTimerSlices.setCountdownTimer({ remainingTime: remainingTimeString }));
+				dispatch(countdownTimerSlices.setCountdownTimerRemainingTime(remainingTimeString));
 
 			}, 1000);