fix(task-refactor): merge task refactor into next

.github/workflows/deploy.yml

@@ -4,12 +4,8 @@ run-name: ${{ github.actor }} is running Deploy CD
 on:
   push:
     branches: # Allow list of deployable tags and branches. Note that all allow-listed branches cannot include any `/` characters
-<<<<<<< next-in-task-refactor
       - next # primary deploy branch
-=======
-      - next
       - task-refactor
->>>>>>> task-refactor
 
 env:
   rid: ${{ github.run_id }}-${{ github.run_number }}

packages/contact-center/cc-components/src/components/task/CallControlCAD/call-control-cad.styles.scss

@@ -45,6 +45,10 @@
   margin-top: 0.5rem;
 }
 
+.cad-global-variables {
+  margin-top: 0.5rem;
+}
+
 /* On-hold chip styling */
 .on-hold {
   display: flex;

packages/contact-center/cc-components/src/components/task/CallControlCAD/call-control-cad.tsx

@@ -5,7 +5,12 @@ import {Avatar, Brandvisual, Icon, Tooltip, Button} from '@momentum-design/compo
 import './call-control-cad.styles.scss';
 import TaskTimer from '../TaskTimer/index';
 import CallControlConsultComponent from '../CallControl/CallControlCustom/call-control-consult';
-import {MEDIA_CHANNEL as MediaChannelType, CallControlComponentProps, CallAssociatedDataMap} from '../task.types';
+import {
+  MEDIA_CHANNEL as MediaChannelType,
+  CallControlComponentProps,
+  getCallerIdentifier,
+  CallAssociatedDataMap,
+} from '../task.types';
 import {getAgentViewableGlobalVariables} from '../Task/task.utils';
 import GlobalVariablesPanel from '../GlobalVariablesPanel/global-variables-panel';
 
@@ -79,11 +84,7 @@ const CallControlCADComponent: React.FC<CallControlComponentProps> = (props) =>
   const customerName = currentTask?.data?.interaction?.callAssociatedDetails?.customerName;
 
   const ani = currentTask?.data?.interaction?.callAssociatedDetails?.ani;
-  const isOutdial = currentTask?.data?.interaction?.outboundType === 'OUTDIAL';
-  const dnis =
-    currentTask?.data?.interaction?.callAssociatedDetails?.dnis ||
-    currentTask?.data?.interaction?.callProcessingDetails?.dnis;
-  const displayNumber = isOutdial ? dnis || ani : ani;
+  const dn = currentTask?.data?.interaction?.callAssociatedDetails?.dn;
 
   const callAssociatedData = currentTask?.data?.interaction?.callAssociatedData as CallAssociatedDataMap | undefined;
   const latestGlobalVariables = getAgentViewableGlobalVariables(callAssociatedData);
@@ -116,8 +117,11 @@ const CallControlCADComponent: React.FC<CallControlComponentProps> = (props) =>
   // For telephony calls, ani is the originating number and dn is the destination.
   // Inbound: ani = caller's number, dn = entry point dialed by caller
   // Outdial: ani = agent's originating number (entry point), dn = customer's dialed number
+  const outboundType = currentTask?.data?.interaction?.outboundType;
+  const callerNumber = getCallerIdentifier(ani, dn, outboundType);
+
   const renderCustomerName = () => {
-    const customerText = isSocial ? customerName || NO_CUSTOMER_NAME : displayNumber || NO_CALLER_ID;
+    const customerText = isSocial ? customerName || NO_CUSTOMER_NAME : callerNumber || NO_CALLER_ID;
 
     const textComponent = (
       <Text

packages/contact-center/cc-components/src/components/task/TaskList/task-list.tsx

@@ -41,7 +41,7 @@ const TaskListComponent: React.FunctionComponent<TaskListComponentProps> = (prop
   const tasks = getTasksArray(taskList!);
 
   // Only one campaign preview should appear — pick the most recent active one
-  const activeCampaignId = hasCampaignPreviewEnabled ? getActiveCampaignPreviewId(tasks) : null;
+  const activeCampaignId = hasCampaignPreviewEnabled ? getActiveCampaignPreviewId(tasks, agentId) : null;
 
   return (
     <ul className="task-list" data-testid="task-list">

packages/contact-center/cc-components/src/components/task/TaskList/task-list.utils.ts

@@ -79,12 +79,11 @@ export const hasAgentJoinedTask = (task: ITask, agentId: string | undefined): bo
   return participants?.[agentId]?.hasJoined === true;
 };
 /**
- * Returns the interactionId of the most recent campaign preview task.
- * Only one campaign preview should be visible at a time; a newer incoming
- * offer supersedes an older hydrated preview.
+ * Returns the interactionId of the most recent active campaign preview task
+ * that the agent has joined. Only one campaign preview should be visible at a time.
  */
-export const getActiveCampaignPreviewId = (tasks: ITask[]): string | null => {
-  const activePreviews = tasks.filter((t) => isCampaignPreviewTask(t));
+export const getActiveCampaignPreviewId = (tasks: ITask[], agentId: string | undefined): string | null => {
+  const activePreviews = tasks.filter((t) => isCampaignPreviewTask(t) && hasAgentJoinedTask(t, agentId));
   if (activePreviews.length === 0) return null;
   // Pick the most recent by createdTimestamp
   activePreviews.sort(

packages/contact-center/cc-components/tests/components/task/CallControlCAD/call-control-cad.tsx

@@ -1,9 +1,15 @@
 import React from 'react';
 import {render} from '@testing-library/react';
 import CallControlCADComponent from '../../../../src/components/task/CallControlCAD/call-control-cad';
-import {CallControlComponentProps, TARGET_TYPE, OUTBOUND_TYPE} from '../../../../src/components/task/task.types';
+import {
+  CallControlComponentProps,
+  TARGET_TYPE,
+  OUTBOUND_TYPE,
+  CallAssociatedDataMap,
+} from '../../../../src/components/task/task.types';
 import {
   mockTask,
+  mockCallAssociatedData,
   createEnabledMainTaskUIControls,
   createMockTaskUIControls,
   enabledControl,
@@ -249,7 +255,7 @@ describe('CallControlCADComponent', () => {
     chatConsultScreen.unmount();
   });
 
-  it.skip('should display correct phone number for inbound vs outdial calls', () => {
+  it('should display correct phone number for inbound vs outdial calls', () => {
     // Inbound call: caller ID = ani, phone number = ani
     const inboundScreen = render(<CallControlCADComponent {...defaultProps} />);
     // ani (555-123-4567) should appear as both caller ID and phone number
@@ -513,4 +519,92 @@ describe('CallControlCADComponent', () => {
       expect(screen.queryByTestId('call-control:participants-trigger')).not.toBeInTheDocument();
     });
   });
+
+  describe('Global Variables', () => {
+    const makePropsWithCallAssociatedData = (callAssociatedData: CallAssociatedDataMap) => ({
+      ...defaultProps,
+      currentTask: {
+        ...defaultProps.currentTask,
+        data: {
+          ...defaultProps.currentTask.data,
+          interaction: {
+            ...defaultProps.currentTask.data.interaction,
+            callAssociatedData,
+          },
+        },
+      },
+    });
+
+    it('should render agent-viewable global variables', () => {
+      const screen = render(<CallControlCADComponent {...makePropsWithCallAssociatedData(mockCallAssociatedData)} />);
+
+      const globalVarsContainer = screen.getByTestId('global-variables-panel');
+      expect(globalVarsContainer).toBeInTheDocument();
+
+      expect(screen.getByText('Customer Language:')).toBeInTheDocument();
+      expect(screen.getByText('English')).toBeInTheDocument();
+
+      expect(screen.getByText('Post Call Survey Opt-in:')).toBeInTheDocument();
+      expect(screen.getByText('true')).toBeInTheDocument();
+    });
+
+    it('should not render non-global variables (e.g. system CAD like ani)', () => {
+      const screen = render(<CallControlCADComponent {...makePropsWithCallAssociatedData(mockCallAssociatedData)} />);
+
+      // ani is a system CAD key, filtered out by getAgentViewableGlobalVariables
+      expect(screen.queryByText('ani:')).not.toBeInTheDocument();
+    });
+
+    it('should not render global variables where agentViewable is false', () => {
+      const screen = render(<CallControlCADComponent {...makePropsWithCallAssociatedData(mockCallAssociatedData)} />);
+
+      // Global_Hidden has agentViewable: false
+      expect(screen.queryByText('Hidden Variable:')).not.toBeInTheDocument();
+    });
+
+    it('should not render global variables section when no global variables exist', () => {
+      const screen = render(<CallControlCADComponent {...defaultProps} />);
+
+      expect(screen.queryByTestId('global-variables-panel')).not.toBeInTheDocument();
+    });
+
+    it('should not render global variables section when callAssociatedData is undefined', () => {
+      const propsWithNoData = {
+        ...defaultProps,
+        currentTask: {
+          ...defaultProps.currentTask,
+          data: {
+            ...defaultProps.currentTask.data,
+            interaction: {
+              ...defaultProps.currentTask.data.interaction,
+            },
+          },
+        },
+      };
+      const screen = render(<CallControlCADComponent {...propsWithNoData} />);
+
+      expect(screen.queryByTestId('global-variables-panel')).not.toBeInTheDocument();
+    });
+
+    it('should use variable name as label when displayName is empty', () => {
+      const dataWithEmptyDisplayName: CallAssociatedDataMap = {
+        Global_NoDisplay: {
+          name: 'Global_NoDisplay',
+          displayName: '',
+          value: 'some value',
+          type: 'STRING',
+          agentEditable: false,
+          agentViewable: true,
+          global: true,
+          isSecure: false,
+          secureKeyId: '',
+          secureKeyVersion: 0,
+        },
+      };
+      const screen = render(<CallControlCADComponent {...makePropsWithCallAssociatedData(dataWithEmptyDisplayName)} />);
+
+      expect(screen.getByText('Global_NoDisplay:')).toBeInTheDocument();
+      expect(screen.getByText('some value')).toBeInTheDocument();
+    });
+  });
 });

packages/contact-center/cc-components/tests/components/task/IncomingTask/incoming-task.utils.tsx

@@ -249,7 +249,7 @@ describe('incoming-task.utils', () => {
         mockTask.data.interaction.outboundType = originalOutboundType;
       });
 
-      it.skip('should extract correct button states for outdial telephony on non-browser', () => {
+      it('should extract correct button states for outdial telephony on non-browser', () => {
         const originalMediaType = mockTask.data.interaction.mediaType;
         const originalCallAssociatedDetails = mockTask.data.interaction.callAssociatedDetails;
         const originalOutboundType = mockTask.data.interaction.outboundType;
@@ -266,7 +266,7 @@ describe('incoming-task.utils', () => {
           ronaTimeout: '30',
         };
 
-        const result = extractIncomingTaskData(mockTask, false);
+        const result = extractIncomingTaskData(mockTask, logger, visibleDisabledAccept, disabledControl, false, false);
 
         expect(result.title).toBe('+14155559876');
         expect(result.acceptText).toBe('Ringing...');

packages/contact-center/cc-components/tests/components/task/TaskList/task-list.utils.tsx

@@ -421,7 +421,7 @@ describe('task-list.utils', () => {
         mockTask.data.interaction.outboundType = originalOutboundType;
       });
 
-      it.skip('should extract correct button states for incoming outdial telephony on non-browser', () => {
+      it('should extract correct button states for incoming outdial telephony on non-browser', () => {
         // Mock isIncomingTask to return true for this test
         (isIncomingTask as jest.Mock).mockReturnValueOnce(true);
 
@@ -442,6 +442,10 @@ describe('task-list.utils', () => {
           virtualTeamName: 'Outbound Team',
           ronaTimeout: '30',
         };
+        mockTask.uiControls = createEnabledMainTaskUIControls({
+          accept: {isVisible: true, isEnabled: false},
+          decline: disabledControl,
+        });
 
         const result = extractTaskListItemData(mockTask, mockTask.data.agentId, undefined, undefined, false);
 

packages/contact-center/store/src/storeEventsWrapper.ts

@@ -585,6 +585,15 @@ class StoreWrapper implements IStoreWrapper {
   };
 
   handleCampaignPreviewReservation = (event: ITask) => {
+    // Only track accepted campaign IDs for actual preview campaigns.
+    // Predictive/progressive campaigns don't need preview-accept tracking.
+    if (this.isCampaignPreview(event)) {
+      const interactionId = event?.data?.interactionId;
+      if (interactionId) {
+        this.addAcceptedCampaign(interactionId);
+      }
+    }
+
     const isCampaignPreview = this.isCampaignPreview(event);
 
     runInAction(() => {
@@ -775,6 +784,7 @@ class StoreWrapper implements IStoreWrapper {
       task.on(CC_EVENTS.REAL_TIME_TRANSCRIPTION, this.realtimeTranscriptionListeners[taskId]);
     }
 
+    // Register media event listener for browser devices
     if (this.deviceType === DEVICE_TYPE_BROWSER) {
       task.on(TASK_EVENTS.TASK_MEDIA, this.handleTaskMedia);
     }

packages/contact-center/store/tests/storeEventsWrapper.ts

@@ -2476,15 +2476,15 @@ describe('storeEventsWrapper', () => {
     });
 
     describe('handleCampaignPreviewReservation — campaign type branching', () => {
-      it.skip('should add to acceptedCampaignIds for standard preview campaign', () => {
+      it('should add to acceptedCampaignIds for standard preview campaign', () => {
         const task = createCampaignPreviewTask('preview-accept-1');
 
         storeWrapper.handleCampaignPreviewReservation(task);
 
         expect(storeWrapper['store'].acceptedCampaignIds.has('preview-accept-1')).toBe(true);
       });
 
-      it.skip('should NOT add to acceptedCampaignIds for predictive campaign', () => {
+      it('should NOT add to acceptedCampaignIds for predictive campaign', () => {
         const task = makeMockTask({
           data: {
             interactionId: 'predictive-accept-1',