fix(multy-party-conference): address-review-comments

Author: akulakum

packages/contact-center/task/src/CallControl/index.tsx

@@ -8,15 +8,7 @@ import {CallControlProps} from '../task.types';
 import {CallControlComponent} from '@webex/cc-components';
 
 const CallControlInternal: React.FunctionComponent<CallControlProps> = observer(
-  ({
-    onHoldResume,
-    onEnd,
-    onWrapUp,
-    onRecordingToggle,
-    onToggleMute,
-    consultTransferOptions,
-    multiPartyConferenceEnabled,
-  }) => {
+  ({onHoldResume, onEnd, onWrapUp, onRecordingToggle, onToggleMute, consultTransferOptions, conferenceEnabled}) => {
     const {
       logger,
       currentTask,
@@ -42,7 +34,7 @@ const CallControlInternal: React.FunctionComponent<CallControlProps> = observer(
         deviceType,
         featureFlags,
         isMuted,
-        multiPartyConferenceEnabled,
+        conferenceEnabled,
         agentId,
       }),
       wrapupCodes,
@@ -65,7 +57,7 @@ const CallControl: React.FunctionComponent<CallControlProps> = (props) => {
         if (store.onErrorCallback) store.onErrorCallback('CallControl', error);
       }}
     >
-      <CallControlInternal {...props} multiPartyConferenceEnabled={props.multiPartyConferenceEnabled ?? true} />
+      <CallControlInternal {...props} conferenceEnabled={props.conferenceEnabled ?? true} />
     </ErrorBoundary>
   );
 };

packages/contact-center/task/src/CallControlCAD/index.tsx

@@ -16,7 +16,7 @@ const CallControlCADInternal: React.FunctionComponent<CallControlProps> = observ
     onToggleMute,
     callControlClassName,
     callControlConsultClassName,
-    multiPartyConferenceEnabled,
+    conferenceEnabled,
     consultTransferOptions,
   }) => {
     const {
@@ -43,7 +43,7 @@ const CallControlCADInternal: React.FunctionComponent<CallControlProps> = observ
         deviceType,
         featureFlags,
         isMuted,
-        multiPartyConferenceEnabled,
+        conferenceEnabled,
         agentId,
       }),
       wrapupCodes,
@@ -68,7 +68,7 @@ const CallControlCAD: React.FunctionComponent<CallControlProps> = (props) => {
         if (store.onErrorCallback) store.onErrorCallback('CallControlCAD', error);
       }}
     >
-      <CallControlCADInternal {...props} multiPartyConferenceEnabled={props.multiPartyConferenceEnabled ?? true} />
+      <CallControlCADInternal {...props} conferenceEnabled={props.conferenceEnabled ?? true} />
     </ErrorBoundary>
   );
 };

packages/contact-center/task/src/Utils/task-util.ts

@@ -177,10 +177,9 @@ export function getConferenceButtonVisibility(
   isCall: boolean,
   isChat: boolean,
   isBeingConsulted: boolean,
-  multiPartyConferenceEnabled: boolean
+  conferenceEnabled: boolean
 ): Visibility {
-  const isVisible =
-    ((isBrowser && isCall && webRtcEnabled) || isChat) && !isBeingConsulted && multiPartyConferenceEnabled;
+  const isVisible = ((isBrowser && isCall && webRtcEnabled) || isChat) && !isBeingConsulted && conferenceEnabled;
 
   return {isVisible, isEnabled: true};
 }
@@ -194,9 +193,9 @@ export function getExitConferenceButtonVisibility(
   consultCallHeld: boolean,
   isHeld: boolean,
   isConsultCompleted: boolean,
-  multiPartyConferenceEnabled: boolean
+  conferenceEnabled: boolean
 ): Visibility {
-  const isVisible = isConferenceInProgress && !isConsultInitiatedOrAccepted && multiPartyConferenceEnabled;
+  const isVisible = isConferenceInProgress && !isConsultInitiatedOrAccepted && conferenceEnabled;
   const isConferenceWithConsultNotHeld = isConferenceInProgress && isConsultInitiatedOrAccepted && !consultCallHeld;
   // Disable if: conference with consult not held OR (held AND in conference AND consult completed)
   const isEnabled = !isConferenceWithConsultNotHeld && !(isHeld && isConferenceInProgress && isConsultCompleted);
@@ -213,9 +212,9 @@ export function getMergeConferenceButtonVisibility(
   consultCallHeld: boolean,
   isConferenceInProgress: boolean,
   isCustomerInCall: boolean,
-  multiPartyConferenceEnabled: boolean
+  conferenceEnabled: boolean
 ): Visibility {
-  const isVisible = isConsultInitiatedOrAccepted && isCustomerInCall && multiPartyConferenceEnabled;
+  const isVisible = isConsultInitiatedOrAccepted && isCustomerInCall && conferenceEnabled;
   const isConferenceWithConsultNotHeld = isConferenceInProgress && isConsultInitiatedOrAccepted && !consultCallHeld;
   const isEnabled = isConsultAccepted && consultCallHeld && !isConferenceWithConsultNotHeld;
 
@@ -288,9 +287,9 @@ export function getMergeConferenceConsultButtonVisibility(
   isConsultInitiated: boolean,
   consultCallHeld: boolean,
   isCustomerInCall: boolean,
-  multiPartyConferenceEnabled: boolean
+  conferenceEnabled: boolean
 ): Visibility {
-  const isVisible = (isConsultAccepted || isConsultInitiated) && multiPartyConferenceEnabled;
+  const isVisible = (isConsultAccepted || isConsultInitiated) && conferenceEnabled;
   const isEnabled = !consultCallHeld && isConsultAccepted && isCustomerInCall;
 
   return {isVisible, isEnabled};
@@ -374,7 +373,7 @@ export function getWrapupButtonVisibility(task: ITask): Visibility {
  * @param featureFlags Feature flags configuration object
  * @param task The task object
  * @param agentId The agent ID
- * @param multiPartyConferenceEnabled Whether multiparty conference is enabled
+ * @param conferenceEnabled Whether conference is enabled
  * @param logger Optional logger instance
  * @returns An object containing the visibility and state of various controls
  */
@@ -383,7 +382,7 @@ export function getControlsVisibility(
   featureFlags: {[key: string]: boolean},
   task: ITask,
   agentId: string,
-  multiPartyConferenceEnabled: boolean,
+  conferenceEnabled: boolean,
   logger?: ILogger
 ) {
   try {
@@ -406,7 +405,7 @@ export function getControlsVisibility(
 
     // Calculate task state flags
     const isTransferVisibility = isBrowser ? webRtcEnabled : true;
-    const isConferenceInProgress = (task?.data?.isConferenceInProgress && multiPartyConferenceEnabled) ?? false;
+    const isConferenceInProgress = (task?.data?.isConferenceInProgress && conferenceEnabled) ?? false;
     const isConsultInProgress = getIsConsultInProgress(task);
     const isHeld = findHoldStatus(task, 'mainCall', agentId);
     const isCustomerInCall = getIsCustomerInCall(task);
@@ -472,23 +471,23 @@ export function getControlsVisibility(
         isCall,
         isChat,
         isBeingConsulted,
-        multiPartyConferenceEnabled
+        conferenceEnabled
       ),
       exitConference: getExitConferenceButtonVisibility(
         isConferenceInProgress,
         isConsultInitiatedOrAccepted,
         consultCallHeld,
         isHeld,
         isConsultCompleted,
-        multiPartyConferenceEnabled
+        conferenceEnabled
       ),
       mergeConference: getMergeConferenceButtonVisibility(
         isConsultInitiatedOrAcceptedOnly,
         isConsultAccepted,
         consultCallHeld,
         isConferenceInProgress,
         isCustomerInCall,
-        multiPartyConferenceEnabled
+        conferenceEnabled
       ),
 
       // Consult controls
@@ -528,7 +527,7 @@ export function getControlsVisibility(
         isConsultInitiated,
         consultCallHeld,
         isCustomerInCall,
-        multiPartyConferenceEnabled
+        conferenceEnabled
       ),
       muteUnmuteConsult: getMuteUnmuteConsultButtonVisibility(
         isBrowser,

packages/contact-center/task/src/helper.ts

@@ -280,7 +280,7 @@ export const useCallControl = (props: useCallControlProps) => {
     deviceType,
     featureFlags,
     isMuted,
-    multiPartyConferenceEnabled,
+    conferenceEnabled,
     agentId,
   } = props;
   const [isRecording, setIsRecording] = useState(true);
@@ -868,8 +868,8 @@ export const useCallControl = (props: useCallControlProps) => {
   };
 
   const controlVisibility = useMemo(
-    () => getControlsVisibility(deviceType, featureFlags, currentTask, agentId, multiPartyConferenceEnabled, logger),
-    [deviceType, featureFlags, currentTask, agentId, multiPartyConferenceEnabled, logger]
+    () => getControlsVisibility(deviceType, featureFlags, currentTask, agentId, conferenceEnabled, logger),
+    [deviceType, featureFlags, currentTask, agentId, conferenceEnabled, logger]
   );
 
   // Add useEffect for auto wrap-up timer

packages/contact-center/task/src/task.types.ts

@@ -20,14 +20,14 @@ export type CallControlProps = Partial<
     | 'callControlClassName'
     | 'callControlConsultClassName'
     | 'onToggleMute'
-    | 'multiPartyConferenceEnabled'
+    | 'conferenceEnabled'
     | 'consultTransferOptions'
   >
 >;
 
 export type useCallControlProps = Pick<
   ControlProps,
-  'currentTask' | 'logger' | 'deviceType' | 'featureFlags' | 'isMuted' | 'multiPartyConferenceEnabled' | 'agentId'
+  'currentTask' | 'logger' | 'deviceType' | 'featureFlags' | 'isMuted' | 'conferenceEnabled' | 'agentId'
 > &
   Partial<Pick<ControlProps, 'onHoldResume' | 'onEnd' | 'onWrapUp' | 'onRecordingToggle' | 'onToggleMute'>>;
 

packages/contact-center/task/tests/CallControl/index.tsx

@@ -104,7 +104,7 @@ describe('CallControl Component', () => {
     expect(useCallControlSpy).toHaveBeenCalledWith({
       currentTask: null,
       onHoldResume: onHoldResumeCb,
-      multiPartyConferenceEnabled: true,
+      conferenceEnabled: true,
       onEnd: onEndCb,
       onWrapUp: onWrapUpCb,
       onRecordingToggle: onRecordingToggleCb,

packages/contact-center/task/tests/CallControlCAD/index.tsx

@@ -111,12 +111,12 @@ describe('CallControlCAD Component', () => {
       featureFlags: store.featureFlags,
       deviceType: '',
       isMuted: false,
-      multiPartyConferenceEnabled: true,
+      conferenceEnabled: true,
       agentId: store.agentId,
     });
   });
 
-  it('should use default multiPartyConferenceEnabled value when not provided', () => {
+  it('should use default conferenceEnabled value when not provided', () => {
     const useCallControlSpy = jest.spyOn(helper, 'useCallControl').mockReturnValue({
       currentTask: mockTask,
       endCall: jest.fn(),
@@ -185,12 +185,12 @@ describe('CallControlCAD Component', () => {
     // Should default to true when not provided
     expect(useCallControlSpy).toHaveBeenCalledWith(
       expect.objectContaining({
-        multiPartyConferenceEnabled: true,
+        conferenceEnabled: true,
       })
     );
   });
 
-  it('should use provided multiPartyConferenceEnabled value', () => {
+  it('should use provided conferenceEnabled value', () => {
     const useCallControlSpy = jest.spyOn(helper, 'useCallControl').mockReturnValue({
       currentTask: mockTask,
       endCall: jest.fn(),
@@ -255,18 +255,13 @@ describe('CallControlCAD Component', () => {
     });
 
     render(
-      <CallControlCAD
-        onHoldResume={onHoldResumeCb}
-        onEnd={onEndCb}
-        onWrapUp={onWrapUpCb}
-        multiPartyConferenceEnabled={false}
-      />
+      <CallControlCAD onHoldResume={onHoldResumeCb} onEnd={onEndCb} onWrapUp={onWrapUpCb} conferenceEnabled={false} />
     );
 
     // Should use the provided value
     expect(useCallControlSpy).toHaveBeenCalledWith(
       expect.objectContaining({
-        multiPartyConferenceEnabled: false,
+        conferenceEnabled: false,
       })
     );
   });