@webex/plugin-meetings 3.8.1-next.1 → 3.8.1-next.10

package/src/controls-options-manager/enums.ts

@@ -14,6 +14,7 @@ enum Control {
   viewTheParticipantList = 'viewTheParticipantList',
   annotation = 'annotation',
   rdc = 'rdc',
+  pollingQA = 'pollingQA',
 }
 
 export {Control, Setting};

package/src/controls-options-manager/types.ts

@@ -48,6 +48,10 @@ export interface RemoteDesktopControlProperties {
   enabled?: boolean;
 }
 
+export interface PollingQAProperties {
+  enabled?: boolean;
+}
+
 export type Properties =
   | AudioProperties
   | RaiseHandProperties
@@ -56,7 +60,8 @@ export type Properties =
   | VideoProperties
   | ViewTheParticipantListProperties
   | AnnotationProperties
-  | RemoteDesktopControlProperties;
+  | RemoteDesktopControlProperties
+  | PollingQAProperties;
 
 export interface ControlConfig<Props = Properties> {
   /**

package/src/controls-options-manager/util.ts

@@ -9,6 +9,7 @@ import {
   VideoProperties,
   type RemoteDesktopControlProperties,
   type AnnotationProperties,
+  type PollingQAProperties,
 } from './types';
 
 /**
@@ -304,6 +305,29 @@ class Utils {
     return Utils.hasHints({requiredHints, displayHints});
   }
 
+  /**
+   * Validate if a pollingQA-scoped control is allowed to be sent to the service.
+   *
+   * @param {ControlConfig<PollingQAProperties>} control - Polling QA config to validate
+   * @param {Array<string>} displayHints - All available hints
+   * @returns {boolean} - True if all of the actions are allowed.
+   */
+  public static canUpdatePollingQA(
+    control: ControlConfig<PollingQAProperties>,
+    displayHints: Array<string>
+  ): boolean {
+    const requiredHints = [];
+
+    if (control.properties.enabled === true) {
+      requiredHints.push(DISPLAY_HINTS.ENABLE_ATTENDEE_START_POLLING_QA);
+    }
+    if (control.properties.enabled === false) {
+      requiredHints.push(DISPLAY_HINTS.DISABLE_ATTENDEE_START_POLLING_QA);
+    }
+
+    return Utils.hasHints({requiredHints, displayHints});
+  }
+
   /**
    * Validate that a control can be sent to the service based on the provided
    * display hints.
@@ -363,6 +387,13 @@ class Utils {
         );
         break;
 
+      case Control.pollingQA:
+        determinant = Utils.canUpdatePollingQA(
+          control as ControlConfig<PollingQAProperties>,
+          displayHints
+        );
+        break;
+
       default:
         determinant = false;
     }

package/src/locus-info/controlsUtils.ts

@@ -124,6 +124,12 @@ ControlsUtils.parse = (controls: any) => {
     };
   }
 
+  if (controls?.pollingQAControl) {
+    parsedControls.pollingQAControl = {
+      enabled: controls.pollingQAControl.enabled,
+    };
+  }
+
   return parsedControls;
 };
 
@@ -235,6 +241,9 @@ ControlsUtils.getControls = (oldControls: any, newControls: any) => {
 
       hasRemoteDesktopControlChanged:
         current?.rdcControl?.enabled !== previous?.rdcControl?.enabled,
+
+      hasPollingQAControlChanged:
+        current?.pollingQAControl?.enabled !== previous?.pollingQAControl?.enabled,
     },
   };
 };

package/src/locus-info/index.ts

@@ -854,6 +854,7 @@ export default class LocusInfo extends EventsScope {
           hasStageViewChanged,
           hasAnnotationControlChanged,
           hasRemoteDesktopControlChanged,
+          hasPollingQAControlChanged,
         },
         current,
       } = ControlsUtils.getControls(this.controls, controls);
@@ -1120,6 +1121,14 @@ export default class LocusInfo extends EventsScope {
         );
       }
 
+      if (hasPollingQAControlChanged) {
+        this.emitScoped(
+          {file: 'locus-info', function: 'updateControls'},
+          LOCUSINFO.EVENTS.CONTROLS_POLLING_QA_CHANGED,
+          {state: current.pollingQAControl}
+        );
+      }
+
       this.controls = controls;
     }
   }

package/src/meeting/in-meeting-actions.ts

@@ -107,6 +107,8 @@ interface IInMeetingActions {
   canEnableRemoteDesktopControl?: boolean;
   canDisableRemoteDesktopControl?: boolean;
   canMoveToLobby?: boolean;
+  canEnablePollingQA?: boolean;
+  canDisablePollingQA?: boolean;
 }
 
 /**
@@ -309,6 +311,10 @@ export default class InMeetingActions implements IInMeetingActions {
 
   canMoveToLobby = null;
 
+  canEnablePollingQA = null;
+
+  canDisablePollingQA = null;
+
   /**
    * Returns all meeting action options
    * @returns {Object}
@@ -411,6 +417,8 @@ export default class InMeetingActions implements IInMeetingActions {
     canEnableRemoteDesktopControl: this.canEnableRemoteDesktopControl,
     canDisableRemoteDesktopControl: this.canDisableRemoteDesktopControl,
     canMoveToLobby: this.canMoveToLobby,
+    canEnablePollingQA: this.canEnablePollingQA,
+    canDisablePollingQA: this.canDisablePollingQA,
   });
 
   /**

package/src/meeting/index.ts

@@ -263,8 +263,9 @@ type FetchMeetingInfoParams = {
 };
 
 type MediaReachabilityMetrics = ReachabilityMetrics & {
-  isSubnetReachable: boolean;
-  selectedCluster: string | null;
+  subnet_reachable: boolean;
+  selected_cluster: string | null;
+  selected_subnet: string | null;
 };
 
 /**
@@ -2757,7 +2758,9 @@ export default class Meeting extends StatelessWebexPlugin {
       LOCUSINFO.EVENTS.CONTROLS_MEETING_TRANSCRIPTION_SPOKEN_LANGUAGE_UPDATED,
       ({spokenLanguage}) => {
         if (spokenLanguage) {
-          this.transcription.languageOptions.currentSpokenLanguage = spokenLanguage;
+          if (this.transcription?.languageOptions) {
+            this.transcription.languageOptions.currentSpokenLanguage = spokenLanguage;
+          }
           // @ts-ignore
           this.webex.internal.voicea.onSpokenLanguageUpdate(spokenLanguage);
 
@@ -2942,6 +2945,15 @@ export default class Meeting extends StatelessWebexPlugin {
         {state}
       );
     });
+
+    this.locusInfo.on(LOCUSINFO.EVENTS.CONTROLS_POLLING_QA_CHANGED, ({state}) => {
+      Trigger.trigger(
+        this,
+        {file: 'meeting/index', function: 'setupLocusControlsListener'},
+        EVENT_TRIGGERS.MEETING_CONTROLS_POLLING_QA_UPDATED,
+        {state}
+      );
+    });
   }
 
   /**
@@ -4383,6 +4395,14 @@ export default class Meeting extends StatelessWebexPlugin {
             requiredHints: [DISPLAY_HINTS.DISABLE_RDC_MEETING_OPTION],
             displayHints: this.userDisplayHints,
           }),
+          canEnablePollingQA: ControlsOptionsUtil.hasHints({
+            requiredHints: [DISPLAY_HINTS.ENABLE_ATTENDEE_START_POLLING_QA],
+            displayHints: this.userDisplayHints,
+          }),
+          canDisablePollingQA: ControlsOptionsUtil.hasHints({
+            requiredHints: [DISPLAY_HINTS.DISABLE_ATTENDEE_START_POLLING_QA],
+            displayHints: this.userDisplayHints,
+          }),
         }) || changed;
     }
     if (changed) {
@@ -4898,11 +4918,6 @@ export default class Meeting extends StatelessWebexPlugin {
 
       // Only send restore event when it was disconnected before and for connected later
       if (!this.hasWebsocketConnected) {
-        // @ts-ignore
-        this.webex.internal.newMetrics.submitClientEvent({
-          name: 'client.mercury.connection.restored',
-          options: {meetingId: this.id},
-        });
         Metrics.sendBehavioralMetric(BEHAVIORAL_METRICS.MERCURY_CONNECTION_RESTORED, {
           correlation_id: this.correlationId,
         });
@@ -4913,11 +4928,6 @@ export default class Meeting extends StatelessWebexPlugin {
     // @ts-ignore
     this.webex.internal.mercury.on(OFFLINE, () => {
       LoggerProxy.logger.error('Meeting:index#setMercuryListener --> Web socket offline');
-      // @ts-ignore
-      this.webex.internal.newMetrics.submitClientEvent({
-        name: 'client.mercury.connection.lost',
-        options: {meetingId: this.id},
-      });
       Metrics.sendBehavioralMetric(BEHAVIORAL_METRICS.MERCURY_CONNECTION_FAILURE, {
         correlation_id: this.correlationId,
       });
@@ -9714,21 +9724,22 @@ export default class Meeting extends StatelessWebexPlugin {
       return total;
     }, 0);
 
+    const selectedSubnetFirstOctet = this.mediaServerIp?.split('.')[0];
+
     let isSubnetReachable = null;
-    if (totalSuccessCases > 0) {
-      // @ts-ignore
-      isSubnetReachable = this.webex.meetings.reachability.isSubnetReachable(this.mediaServerIp);
+    if (totalSuccessCases > 0 && selectedSubnetFirstOctet) {
+      isSubnetReachable =
+        // @ts-ignore
+        this.webex.meetings.reachability.isSubnetReachable(selectedSubnetFirstOctet);
     }
 
-    let selectedCluster = null;
-    if (this.mediaConnections && this.mediaConnections.length > 0) {
-      selectedCluster = this.mediaConnections[0].mediaAgentCluster;
-    }
+    const selectedCluster = this.mediaConnections?.[0]?.mediaAgentCluster ?? null;
 
     return {
       ...reachabilityMetrics,
-      isSubnetReachable,
-      selectedCluster,
+      subnet_reachable: isSubnetReachable,
+      selected_cluster: selectedCluster,
+      selected_subnet: selectedSubnetFirstOctet ? `${selectedSubnetFirstOctet}.X.X.X` : null,
     };
   }
 }

package/src/reachability/index.ts

@@ -140,22 +140,14 @@ export default class Reachability extends EventsScope {
 
   /**
    * Checks if the given subnet is reachable
-   * @param {string} mediaServerIp - media server ip
+   * @param {string} selectedSubnetFirstOctet - selected subnet first octet, e.g. "10" for "10.X.X.X"
    * @returns {boolean | null} true if reachable, false if not reachable, null if mediaServerIp is not provided
    * @public
    * @memberof Reachability
    */
-  public isSubnetReachable(mediaServerIp?: string): boolean | null {
-    if (!mediaServerIp) {
-      LoggerProxy.logger.error(`Reachability:index#isSubnetReachable --> mediaServerIp is null`);
-
-      return null;
-    }
-
-    const subnetFirstOctet = mediaServerIp.split('.')[0];
-
+  public isSubnetReachable(selectedSubnetFirstOctet: string): boolean | null {
     LoggerProxy.logger.info(
-      `Reachability:index#isSubnetReachable --> Looking for subnet: ${subnetFirstOctet}.X.X.X`
+      `Reachability:index#isSubnetReachable --> Looking for subnet: ${selectedSubnetFirstOctet}.X.X.X`
     );
 
     const matchingReachedClusters = Object.values(this.clusterReachability).reduce(
@@ -167,7 +159,7 @@ export default class Reachability extends EventsScope {
           const subnet = reachedSubnetsArray[i];
           const reachedSubnetFirstOctet = subnet.split('.')[0];
 
-          if (subnetFirstOctet === reachedSubnetFirstOctet) {
+          if (selectedSubnetFirstOctet === reachedSubnetFirstOctet) {
             acc.add(cluster.name);
           }
 
@@ -186,7 +178,7 @@ export default class Reachability extends EventsScope {
     );
 
     LoggerProxy.logger.info(
-      `Reachability:index#isSubnetReachable --> Found ${matchingReachedClusters.size} clusters that use the subnet ${subnetFirstOctet}.X.X.X`
+      `Reachability:index#isSubnetReachable --> Found ${matchingReachedClusters.size} clusters that use the subnet ${selectedSubnetFirstOctet}.X.X.X`
     );
 
     return matchingReachedClusters.size > 0;

package/test/unit/spec/controls-options-manager/util.js

@@ -473,6 +473,40 @@ describe('plugin-meetings', () => {
           assert.equal(results, expected);
         });
       });
+      
+      describe('canUpdatePollingQA()', () => {
+        beforeEach(() => {
+          sinon.stub(ControlsOptionsUtil, 'hasHints').returns(true);
+        });
+
+        it('should call hasHints() with proper hints when `enabled` is true', () => {
+          ControlsOptionsUtil.canUpdatePollingQA({properties: {enabled: true}}, []);
+
+          assert.calledWith(ControlsOptionsUtil.hasHints, {
+            requiredHints: [DISPLAY_HINTS.ENABLE_ATTENDEE_START_POLLING_QA],
+            displayHints: [],
+          });
+        });
+
+        it('should call hasHints() with proper hints when `enabled` is false', () => {
+          ControlsOptionsUtil.canUpdatePollingQA({properties: {enabled: false}}, []);
+
+          assert.calledWith(ControlsOptionsUtil.hasHints, {
+            requiredHints: [DISPLAY_HINTS.DISABLE_ATTENDEE_START_POLLING_QA],
+            displayHints: [],
+          });
+        });
+
+        it('should return the resolution of hasHints()', () => {
+          const expected = 'example-return-value';
+          ControlsOptionsUtil.hasHints.returns(expected);
+
+          const results = ControlsOptionsUtil.canUpdatePollingQA({properties: {}}, []);
+
+          assert.calledOnce(ControlsOptionsUtil.hasHints);
+          assert.equal(results, expected);
+        });
+      });
 
       describe('canUpdate()', () => {
         const displayHints = [];
@@ -486,6 +520,7 @@ describe('plugin-meetings', () => {
           ControlsOptionsUtil.canUpdateViewTheParticipantsList = sinon.stub().returns(true);
           ControlsOptionsUtil.canUpdateAnnotation = sinon.stub().returns(true);
           ControlsOptionsUtil.canUpdateRemoteDesktopControl = sinon.stub().returns(true);
+          ControlsOptionsUtil.canUpdatePollingQA = sinon.stub().returns(true);
         });
 
         it('should only call canUpdateAudio() if the scope is audio', () => {
@@ -621,6 +656,28 @@ describe('plugin-meetings', () => {
             control,
             displayHints
           );
+          assert.callCount(ControlsOptionsUtil.canUpdatePollingQA, 0);
+          assert.isTrue(results);
+        });
+
+        it('should only call canUpdatePollingQA() if the scope is pollingQA', () => {
+          const control = {scope: 'pollingQA'};
+
+          const results = ControlsOptionsUtil.canUpdate(control, displayHints);
+
+          assert.callCount(ControlsOptionsUtil.canUpdateAudio, 0);
+          assert.callCount(ControlsOptionsUtil.canUpdateRaiseHand, 0);
+          assert.callCount(ControlsOptionsUtil.canUpdateReactions, 0);
+          assert.callCount(ControlsOptionsUtil.canUpdateShareControl, 0);
+          assert.callCount(ControlsOptionsUtil.canUpdateVideo, 0);
+          assert.callCount(ControlsOptionsUtil.canUpdateViewTheParticipantsList, 0);
+          assert.callCount(ControlsOptionsUtil.canUpdateAnnotation, 0);
+          assert.callCount(ControlsOptionsUtil.canUpdateRemoteDesktopControl, 0);
+          assert.calledWith(
+            ControlsOptionsUtil.canUpdatePollingQA,
+            control,
+            displayHints
+          );
           assert.isTrue(results);
         });
 
@@ -637,6 +694,7 @@ describe('plugin-meetings', () => {
           assert.callCount(ControlsOptionsUtil.canUpdateViewTheParticipantsList, 0);
           assert.callCount(ControlsOptionsUtil.canUpdateAnnotation, 0);
           assert.callCount(ControlsOptionsUtil.canUpdateRemoteDesktopControl, 0);
+          assert.callCount(ControlsOptionsUtil.canUpdatePollingQA, 0);
           assert.isFalse(results);
         });
       });

package/test/unit/spec/locus-info/controlsUtils.js

@@ -164,6 +164,14 @@ describe('plugin-meetings', () => {
 
         assert.equal(parsedControls.rdcControl.enabled, newControls.rdcControl.enabled);
       });
+      
+      it('should parse the pollingQAControl control', () => {
+        const newControls = {pollingQAControl: {enabled: true}};
+
+        const parsedControls = ControlsUtils.parse(newControls);
+
+        assert.equal(parsedControls.pollingQAControl.enabled, newControls.pollingQAControl.enabled);
+      });
 
       describe('videoEnabled', () => {
         it('returns expected', () => {
@@ -411,6 +419,14 @@ describe('plugin-meetings', () => {
         assert.equal(updates.hasRemoteDesktopControlChanged, true);
       });
 
+      it('returns hasPollingQAControlChanged = true when changed', () => {
+        const newControls = {pollingQAControl: {enabled: true}};
+
+        const {updates} = ControlsUtils.getControls(defaultControls, newControls);
+
+        assert.equal(updates.hasPollingQAControlChanged, true);
+      });
+
       it('returns false when previous spoken language is undefined and current is a invalid value', () => {
         const previous = { transcribe: undefined };
         const current = { transcribe: { spokenLanguage: null } };

package/test/unit/spec/locus-info/index.js

@@ -305,6 +305,20 @@ describe('plugin-meetings', () => {
           {state: newControls.rdcControl}
         );
       });
+      
+      it('should trigger the CONTROLS_POLLING_QA_CHANGED event when necessary', () => {
+        locusInfo.controls = {};
+        locusInfo.emitScoped = sinon.stub();
+        newControls.pollingQAControl = { enabled: true };
+        locusInfo.updateControls(newControls);
+
+        assert.calledWith(
+          locusInfo.emitScoped,
+          {file: 'locus-info', function: 'updateControls'},
+          LOCUSINFO.EVENTS.CONTROLS_POLLING_QA_CHANGED,
+          {state: newControls.pollingQAControl}
+        );
+      });
 
       it('should keep the recording state to `IDLE`', () => {
         locusInfo.controls = {

package/test/unit/spec/meeting/in-meeting-actions.ts

@@ -102,6 +102,8 @@ describe('plugin-meetings', () => {
         canEnableRemoteDesktopControl: null,
         canDisableRemoteDesktopControl: null,
         canMoveToLobby: null,
+        canEnablePollingQA: null,
+        canDisablePollingQA: null,
 
         ...expected,
       };
@@ -210,6 +212,8 @@ describe('plugin-meetings', () => {
       'canEnableRemoteDesktopControl',
       'canDisableRemoteDesktopControl',
       'canMoveToLobby',
+      'canEnablePollingQA',
+      'canDisablePollingQA',
     ].forEach((key) => {
       it(`get and set for ${key} work as expected`, () => {
         const inMeetingActions = new InMeetingActions();