Skip to content

Commit

Permalink
[FIX] Fixed incorrect call to useCallCloseRoom
Browse files Browse the repository at this point in the history
  • Loading branch information
aleksandernsilva committed Jun 24, 2022
1 parent d9367c5 commit cc32d4d
Showing 1 changed file with 35 additions and 36 deletions.
71 changes: 35 additions & 36 deletions apps/meteor/client/providers/CallProvider/CallProvider.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { OutgoingByeRequest } from 'sip.js/lib/core';
import { CustomSounds } from '../../../app/custom-sounds/client';
import { getUserPreference } from '../../../app/utils/client';
import { WrapUpCallModal } from '../../components/voip/modal/WrapUpCallModal';
import { CallContext, CallContextValue, useCallCloseRoom } from '../../contexts/CallContext';
import { CallContext, CallContextValue } from '../../contexts/CallContext';
import { roomCoordinator } from '../../lib/rooms/roomCoordinator';
import { QueueAggregator } from '../../lib/voip/QueueAggregator';
import { useVoipClient } from './hooks/useVoipClient';
Expand Down Expand Up @@ -55,14 +55,42 @@ export const CallProvider: FC = ({ children }) => {
const [queueCounter, setQueueCounter] = useState(0);
const [queueName, setQueueName] = useState('');

const openWrapUpModal = useCallback((): void => {
setModal(() => <WrapUpCallModal closeRoom={useCallCloseRoom} />);
}, [setModal]);
const visitorEndpoint = useEndpoint('POST', '/v1/livechat/visitor');
const voipEndpoint = useEndpoint('GET', '/v1/voip/room');
const voipCloseRoomEndpoint = useEndpoint('POST', '/v1/voip/room.close');

const [roomInfo, setRoomInfo] = useState<{ v: { token?: string }; rid: string }>();
const [queueAggregator, setQueueAggregator] = useState<QueueAggregator>();

const [networkStatus, setNetworkStatus] = useState<NetworkState>('online');

const openRoom = (rid: IVoipRoom['_id']): void => {
roomCoordinator.openRouteLink('v', { rid });
};

const closeRoom = useCallback(
async ({ comment, tags }: { comment?: string; tags?: string[] } = {}): Promise<void> => {
roomInfo &&
(await voipCloseRoomEndpoint({
rid: roomInfo.rid,
token: roomInfo.v.token || '',
options: { comment, tags },
}));

homeRoute.push({});

const queueAggregator = result.voipClient?.getAggregator();

if (queueAggregator) {
queueAggregator.callEnded();
}
},
[homeRoute, voipCloseRoomEndpoint, result.voipClient, roomInfo],
);

const openWrapUpModal = useCallback((): void => {
setModal(() => <WrapUpCallModal closeRoom={closeRoom} />);
}, [closeRoom, setModal]);

useEffect(() => {
if (!result?.voipClient) {
return;
Expand Down Expand Up @@ -234,16 +262,6 @@ export const CallProvider: FC = ({ children }) => {
};
}, [onNetworkConnected, onNetworkDisconnected, result.voipClient]);

const visitorEndpoint = useEndpoint('POST', '/v1/livechat/visitor');
const voipEndpoint = useEndpoint('GET', '/v1/voip/room');
const voipCloseRoomEndpoint = useEndpoint('POST', '/v1/voip/room.close');

const [roomInfo, setRoomInfo] = useState<{ v: { token?: string }; rid: string }>();

const openRoom = (rid: IVoipRoom['_id']): void => {
roomCoordinator.openRouteLink('v', { rid });
};

const contextValue: CallContextValue = useMemo(() => {
if (!voipEnabled) {
return {
Expand Down Expand Up @@ -319,29 +337,10 @@ export const CallProvider: FC = ({ children }) => {
}
return '';
},
closeRoom: async ({ comment, tags }: { comment?: string; tags?: string[] }): Promise<void> => {
roomInfo && (await voipCloseRoomEndpoint({ rid: roomInfo.rid, token: roomInfo.v.token || '', options: { comment, tags } }));
homeRoute.push({});
const queueAggregator = voipClient.getAggregator();
if (queueAggregator) {
queueAggregator.callEnded();
}
},
closeRoom,
openWrapUpModal,
};
}, [
voipEnabled,
user,
result,
roomInfo,
queueCounter,
queueName,
openWrapUpModal,
visitorEndpoint,
voipEndpoint,
voipCloseRoomEndpoint,
homeRoute,
]);
}, [voipEnabled, user, result, roomInfo, queueCounter, queueName, openWrapUpModal, visitorEndpoint, voipEndpoint, closeRoom]);

return (
<CallContext.Provider value={contextValue}>
Expand Down

0 comments on commit cc32d4d

Please sign in to comment.