@webex/plugin-meetings 3.12.0-next.90 → 3.12.0-next.92

package/dist/webinar/index.js

@@ -869,7 +869,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
       }, _callee1);
     }))();
   },
-  version: "3.12.0-next.90"
+  version: "3.12.0-next.92"
 });
 var _default = exports.default = Webinar;
 //# sourceMappingURL=index.js.map

package/package.json

@@ -44,7 +44,7 @@
     "@webex/event-dictionary-ts": "^1.0.2181",
     "@webex/jest-config-legacy": "0.0.0",
     "@webex/legacy-tools": "0.0.0",
-    "@webex/plugin-rooms": "3.12.0-next.30",
+    "@webex/plugin-rooms": "3.12.0-next.31",
     "@webex/test-helper-chai": "3.12.0-next.5",
     "@webex/test-helper-mocha": "3.12.0-next.5",
     "@webex/test-helper-mock-webex": "3.12.0-next.5",
@@ -63,20 +63,20 @@
   "dependencies": {
     "@webex/common": "3.12.0-next.5",
     "@webex/internal-media-core": "2.26.1",
-    "@webex/internal-plugin-conversation": "3.12.0-next.30",
-    "@webex/internal-plugin-device": "3.12.0-next.28",
-    "@webex/internal-plugin-llm": "3.12.0-next.32",
-    "@webex/internal-plugin-mercury": "3.12.0-next.29",
-    "@webex/internal-plugin-metrics": "3.12.0-next.28",
-    "@webex/internal-plugin-support": "3.12.0-next.30",
-    "@webex/internal-plugin-user": "3.12.0-next.29",
-    "@webex/internal-plugin-voicea": "3.12.0-next.32",
+    "@webex/internal-plugin-conversation": "3.12.0-next.31",
+    "@webex/internal-plugin-device": "3.12.0-next.29",
+    "@webex/internal-plugin-llm": "3.12.0-next.33",
+    "@webex/internal-plugin-mercury": "3.12.0-next.30",
+    "@webex/internal-plugin-metrics": "3.12.0-next.29",
+    "@webex/internal-plugin-support": "3.12.0-next.31",
+    "@webex/internal-plugin-user": "3.12.0-next.30",
+    "@webex/internal-plugin-voicea": "3.12.0-next.33",
     "@webex/media-helpers": "3.12.0-next.9",
-    "@webex/plugin-people": "3.12.0-next.29",
-    "@webex/plugin-rooms": "3.12.0-next.30",
+    "@webex/plugin-people": "3.12.0-next.30",
+    "@webex/plugin-rooms": "3.12.0-next.31",
     "@webex/ts-sdp": "^1.8.1",
     "@webex/web-capabilities": "^1.10.0",
-    "@webex/webex-core": "3.12.0-next.28",
+    "@webex/webex-core": "3.12.0-next.29",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",
@@ -94,5 +94,5 @@
   "//": [
     "TODO: upgrade jwt-decode when moving to node 18"
   ],
-  "version": "3.12.0-next.90"
+  "version": "3.12.0-next.92"
 }

package/src/locus-info/index.ts

@@ -518,7 +518,7 @@ export default class LocusInfo extends EventsScope {
     this.updateControls(locus.controls, locus.self);
     this.updateLocusUrl(locus.url, ControlsUtils.isMainSessionDTO(locus));
     this.updateFullState(locus.fullState);
-    this.updateMeetingInfo(locus.info);
+    this.updateMeetingInfo(locus.info, locus.self);
     this.updateEmbeddedApps(locus.embeddedApps);
     // self and participants generate sipUrl for 1:1 meeting
     this.updateSelf(locus.self);
@@ -2491,9 +2491,19 @@ export default class LocusInfo extends EventsScope {
    */
   updateMeetingInfo(info: object, self?: object) {
     const roles = self ? SelfUtils.getRoles(self) : this.parsedLocus.self?.roles || [];
-    if ((info && !isEqual(this.info, info)) || (!isEqual(this.roles, roles) && info)) {
-      const isJoined = SelfUtils.isJoined(self || this.parsedLocus.self);
-      const parsedInfo = InfoUtils.getInfos(this.parsedLocus.info, info, roles, isJoined);
+    const isJoined = SelfUtils.isJoined(self || this.parsedLocus.self);
+
+    // The parsed userDisplayHints depend on info, roles and isJoined, so we must recompute
+    // whenever any of them changes. A common case is self transitioning to JOINED via a delta
+    // that doesn't carry an info section - in that case we fall back to the previously stored
+    // info so the hints get reparsed with the new joined state (e.g. VIEW_THE_PARTICIPANT_LIST).
+    const infoToParse = info || this.info;
+    const infoChanged = info && !isEqual(this.info, info);
+    const rolesChanged = !isEqual(this.roles, roles);
+    const isJoinedChanged = SelfUtils.isJoined(this.parsedLocus.self) !== isJoined;
+
+    if (infoToParse && (infoChanged || rolesChanged || isJoinedChanged)) {
+      const parsedInfo = InfoUtils.getInfos(this.parsedLocus.info, infoToParse, roles, isJoined);
 
       if (parsedInfo.updates.isLocked) {
         this.emitScoped(
@@ -2516,7 +2526,7 @@ export default class LocusInfo extends EventsScope {
         );
       }
 
-      this.info = info;
+      this.info = infoToParse;
       this.parsedLocus.info = parsedInfo.current;
       // Parses the info and adds necessary values
       this.updateMeeting(parsedInfo.current);

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

@@ -2846,6 +2846,10 @@ describe('plugin-meetings', () => {
 
         let expectedMeeting;
 
+        // simulate that updateSelf has been called previously (as happens in production)
+        // so that parsedLocus.self reflects the joined state
+        locusInfo.parsedLocus.self = {state: 'JOINED'};
+
         /*
         When the event is triggered, it is required that the meeting has already
         been updated. This is why the meeting is being checked within the stubbed event emitter
@@ -2997,6 +3001,46 @@ describe('plugin-meetings', () => {
         // since self is not passed to updateMeetingInfo, MEETING_INFO_UPDATED should be triggered with isIntializing: true
         checkMeetingInfoUpdatedCalledForRoles(true, {isInitializing: true});
       });
+
+      // joined-section hints (like ROSTER_IN_MEETING) are filtered out while not joined, so they
+      // are a good proxy for verifying that userDisplayHints get recomputed on a join transition
+      [
+        {
+          name: 'the JOINED delta carries the info section',
+          getSecondInfo: (info) => info,
+        },
+        {
+          name: 'the JOINED delta omits the info section (falls back to stored info)',
+          getSecondInfo: () => undefined,
+        },
+      ].forEach(({name, getSecondInfo}) => {
+        it(`recomputes userDisplayHints when self transitions to JOINED with unchanged roles and ${name}`, () => {
+          const info = cloneDeep(meetingInfo); // joined: ['ROSTER_IN_MEETING', 'LOCK_STATUS_UNLOCKED']
+
+          const notJoinedSelf = cloneDeep(self);
+          notJoinedSelf.state = 'IDLE';
+          notJoinedSelf.controls.role.roles = [];
+
+          const joinedSelf = cloneDeep(self);
+          joinedSelf.state = 'JOINED';
+          joinedSelf.controls.role.roles = [];
+
+          sinon.stub(locusInfo, 'emitScoped');
+
+          // first update while not joined: joined-section hints are filtered out
+          locusInfo.updateMeetingInfo(info, notJoinedSelf);
+          assert.notInclude(locusInfo.parsedLocus.info.userDisplayHints, 'ROSTER_IN_MEETING');
+          assert.notInclude(locusInfo.parsedLocus.info.userDisplayHints, 'LOCK_STATUS_UNLOCKED');
+
+          // self transitions to JOINED - info and roles are unchanged
+          locusInfo.updateMeetingInfo(getSecondInfo(info), joinedSelf);
+
+          // the hints must be recomputed with the new joined state
+          assert.include(locusInfo.parsedLocus.info.userDisplayHints, 'ROSTER_IN_MEETING');
+          assert.include(locusInfo.parsedLocus.info.userDisplayHints, 'LOCK_STATUS_UNLOCKED');
+          checkMeetingInfoUpdatedCalled(true, {isInitializing: false});
+        });
+      });
     });
 
     describe('#updateMediaShares', () => {