Skip to content

Fixing hold/unhod state #1268

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 19, 2018
Merged

Fixing hold/unhod state #1268

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4f8232
[active call control] fixing-hold&unhold state
tuluxmu Sep 19, 2018
2eaf254
unhold state.
tuluxmu Sep 19, 2018
f630990
hold/unhold state
tuluxmu Sep 19, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 15 additions & 20 deletions packages/ringcentral-integration/modules/ActiveCallControl/getDataReducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { combineReducers } from 'redux';
import { isHangUp, isReject } from './helpers';
import activeCallControlStatus from '../../enums/activeCallControlStatus';


function updateActiveSessionStatus({
state,
Expand All @@ -20,16 +22,24 @@ function updateActiveSessionStatus({
} else {
newState[sessionId] = {
...newState[sessionId],
muted,
standAlone,
code,
sessionId,
isOnMute: muted,
isOnHold: code === activeCallControlStatus.hold,
isReject: isReject({ direction, code })
};
}
return newState;
}

function setActiveSessionStatus(state, sessionId, obj) {
const newState = { ...state };
newState[sessionId] = {
...newState[sessionId],
...obj
};
return newState;
}
function getActiveSessionIdReducer(types) {
return (state = null, { type, sessionId }) => {
switch (type) {
Expand Down Expand Up @@ -91,30 +101,15 @@ function getActiveSessionsStatusReducer(types) {
}
case types.startRecord:
case types.stopRecord: {
const newState = { ...state };
newState[sessionId] = {
...newState[sessionId],
isOnRecording: type === types.startRecord
};
return newState;
return setActiveSessionStatus(state, sessionId, { isOnRecording: type === types.startRecord });
}
case types.mute:
case types.unmute: {
const newState = { ...state };
newState[sessionId] = {
...newState[sessionId],
isOnMute: type === types.mute
};
return newState;
return setActiveSessionStatus(state, sessionId, { isOnMute: type === types.mute });
}
case types.hold:
case types.unhold: {
const newState = { ...state };
newState[sessionId] = {
...newState[sessionId],
isOnHold: type === types.hold
};
return newState;
return setActiveSessionStatus(state, sessionId, { isOnHold: type === types.hold });
}
case types.removeActiveSession: {
const newState = { ...state };
Expand Down
10 changes: 5 additions & 5 deletions packages/ringcentral-integration/modules/ActiveCallControl/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ export function isHangUp(code) {
}
export function isReject({ direction, code }) {
return (direction === callDirections.inbound) &&
(code === activeCallControlStatus.setUp || code === activeCallControlStatus.proceeding);
(code === activeCallControlStatus.setUp || code === activeCallControlStatus.proceeding);
}
export function normalizeSession({
call,
Expand All @@ -27,8 +27,8 @@ export function normalizeSession({
sessionId,
} = call;
const {
muted,
code,
isOnMute,
isOnHold,
isReject,
isOnRecording,
} = activeSessionStatus;
Expand All @@ -46,10 +46,10 @@ export function normalizeSession({
callStatus: telephonyStatus || result,
startTime,
creationTime: startTime,
isOnMute: muted,
isOnMute,
isForwarded: false,
isOnFlip: false,
isOnHold: code === activeCallControlStatus.hold,
isOnHold,
isOnTransfer: false,
isReplied: false,
isToVoicemail: false,
Expand Down