@webex/plugin-meetings 3.0.0-beta.147 → 3.0.0-beta.148

package/dist/types/meeting/index.d.ts

@@ -582,6 +582,13 @@ export default class Meeting extends StatelessWebexPlugin {
      * @memberof Meeting
      */
     private setupLocusControlsListener;
+    /**
+     * Trigger annotation info update event
+     @returns {undefined}
+     @param {object} contentShare
+     @param {object} previousContentShare
+     */
+    private triggerAnnotationInfoEvent;
     /**
      * Set up the locus info media shares listener
      * update content and whiteboard sharing id value for members, and updates the member

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.147",
+  "version": "3.0.0-beta.148",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -32,12 +32,12 @@
     "build": "yarn run -T tsc --declaration true --declarationDir ./dist/types"
   },
   "devDependencies": {
-    "@webex/plugin-meetings": "3.0.0-beta.147",
-    "@webex/test-helper-chai": "3.0.0-beta.147",
-    "@webex/test-helper-mocha": "3.0.0-beta.147",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.147",
-    "@webex/test-helper-retry": "3.0.0-beta.147",
-    "@webex/test-helper-test-users": "3.0.0-beta.147",
+    "@webex/plugin-meetings": "3.0.0-beta.148",
+    "@webex/test-helper-chai": "3.0.0-beta.148",
+    "@webex/test-helper-mocha": "3.0.0-beta.148",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.148",
+    "@webex/test-helper-retry": "3.0.0-beta.148",
+    "@webex/test-helper-test-users": "3.0.0-beta.148",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -46,19 +46,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.147",
+    "@webex/common": "3.0.0-beta.148",
     "@webex/internal-media-core": "1.38.3",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.147",
-    "@webex/internal-plugin-device": "3.0.0-beta.147",
-    "@webex/internal-plugin-llm": "3.0.0-beta.147",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.147",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.147",
-    "@webex/internal-plugin-support": "3.0.0-beta.147",
-    "@webex/internal-plugin-user": "3.0.0-beta.147",
-    "@webex/media-helpers": "3.0.0-beta.147",
-    "@webex/plugin-people": "3.0.0-beta.147",
-    "@webex/plugin-rooms": "3.0.0-beta.147",
-    "@webex/webex-core": "3.0.0-beta.147",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.148",
+    "@webex/internal-plugin-device": "3.0.0-beta.148",
+    "@webex/internal-plugin-llm": "3.0.0-beta.148",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.148",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.148",
+    "@webex/internal-plugin-support": "3.0.0-beta.148",
+    "@webex/internal-plugin-user": "3.0.0-beta.148",
+    "@webex/media-helpers": "3.0.0-beta.148",
+    "@webex/plugin-people": "3.0.0-beta.148",
+    "@webex/plugin-rooms": "3.0.0-beta.148",
+    "@webex/webex-core": "3.0.0-beta.148",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/annotation/index.ts

@@ -85,7 +85,6 @@ class AnnotationChannel extends WebexPlugin implements IAnnotationChannel {
           payload: e.data.approval,
         }
       );
-      this.seqNum = (e?.sequenceNumber || 0) + 1;
     }
   }
 
@@ -96,7 +95,6 @@ class AnnotationChannel extends WebexPlugin implements IAnnotationChannel {
   private eventDataProcessor(e) {
     switch (e?.data?.relayType) {
       case ANNOTATION_RELAY_TYPES.ANNOTATION_CLIENT:
-        this.seqNum = (e?.sequenceNumber || 0) + 1;
         this.processStrokeMessage(e.data);
         break;
       default:

package/src/meeting/index.ts

@@ -2200,6 +2200,29 @@ export default class Meeting extends StatelessWebexPlugin {
     });
   }
 
+  /**
+   * Trigger annotation info update event
+   @returns {undefined}
+   @param {object} contentShare
+   @param {object} previousContentShare
+   */
+  private triggerAnnotationInfoEvent(contentShare, previousContentShare) {
+    if (
+      contentShare?.annotation &&
+      !isEqual(contentShare?.annotation, previousContentShare?.annotation)
+    ) {
+      Trigger.trigger(
+        this,
+        {
+          file: 'meeting/index',
+          function: 'triggerAnnotationInfoEvent',
+        },
+        EVENT_TRIGGERS.MEETING_UPDATE_ANNOTATION_INFO,
+        contentShare.annotation
+      );
+    }
+  }
+
   /**
    * Set up the locus info media shares listener
    * update content and whiteboard sharing id value for members, and updates the member
@@ -2215,17 +2238,7 @@ export default class Meeting extends StatelessWebexPlugin {
       const previousContentShare = payload.previous?.content;
       const previousWhiteboardShare = payload.previous?.whiteboard;
 
-      if (!isEqual(contentShare?.annotation, previousContentShare?.annotation)) {
-        Trigger.trigger(
-          this,
-          {
-            file: 'meetings/index',
-            function: 'remoteShare',
-          },
-          EVENT_TRIGGERS.MEETING_UPDATE_ANNOTATION_INFO,
-          contentShare.annotation
-        );
-      }
+      this.triggerAnnotationInfoEvent(contentShare, previousContentShare);
 
       if (
         contentShare.beneficiaryId === previousContentShare?.beneficiaryId &&

package/test/unit/spec/annotation/index.ts

@@ -189,7 +189,7 @@ describe('live-annotation', () => {
     });
 
 
-    describe('encrypt/decrypt Content ', () => {
+    describe('encrypt/decrypt Content', () => {
       beforeEach(async () => {
         annotationService.webex.internal.encryption.encryptText = sinon.stub().returns(Promise.resolve('RETURN_VALUE'));
         annotationService.webex.internal.encryption.decryptText = sinon.stub().returns(Promise.resolve('RETURN_VALUE'));
@@ -201,7 +201,7 @@ describe('live-annotation', () => {
         assert.equal(result, 'RETURN_VALUE')
       });
 
-      it('decryptContent ', async() => {
+      it('decryptContent', async() => {
         const result =  await annotationService.decryptContent("decryptionKeyUrl", "content");
         assert.calledOnceWithExactly(webex.internal.encryption.decryptText, "decryptionKeyUrl", "content");
         assert.equal(result, 'RETURN_VALUE')
@@ -232,7 +232,7 @@ describe('live-annotation', () => {
       });
 
 
-      it('works on  publish Stroke Data', async () => {
+      it('works on publish Stroke Data', async () => {
         const strokeData = {
           content: {
             "contentsBuffer": [{
@@ -343,7 +343,7 @@ describe('live-annotation', () => {
         });
       });
 
-      describe('change annotation options', () => {
+      describe('change annotation info by presenter', () => {
         it('makes change annotation options as expected', async() => {
           const options =  { annotationInfo:{
               version: '1',

package/test/unit/spec/meeting/index.js

@@ -5489,6 +5489,50 @@ describe('plugin-meetings', () => {
         });
       });
       describe('share scenarios', () => {
+
+        describe('triggerAnnotationInfoEvent', () => {
+          it('check triggerAnnotationInfoEvent event', () => {
+
+            TriggerProxy.trigger.reset();
+            const annotationInfo = {version: '1', policy: 'Approval'};
+            meeting.triggerAnnotationInfoEvent({annotation:annotationInfo},{});
+
+            assert.calledWith(
+              TriggerProxy.trigger,
+              meeting,
+              {
+                file: 'meeting/index',
+                function: 'triggerAnnotationInfoEvent',
+              },
+              'meeting:updateAnnotationInfo',
+              annotationInfo
+            );
+
+            TriggerProxy.trigger.reset();
+            meeting.triggerAnnotationInfoEvent({annotation:annotationInfo},{annotation:annotationInfo});
+            assert.notCalled(TriggerProxy.trigger);
+
+            TriggerProxy.trigger.reset();
+            const annotationInfoUpdated = {version: '1', policy: 'AnnotationNotAllowed'};
+            meeting.triggerAnnotationInfoEvent({annotation:annotationInfoUpdated},{annotation:annotationInfo});
+            assert.calledWith(
+              TriggerProxy.trigger,
+              meeting,
+              {
+                file: 'meeting/index',
+                function: 'triggerAnnotationInfoEvent',
+              },
+              'meeting:updateAnnotationInfo',
+              annotationInfoUpdated
+            );
+
+            TriggerProxy.trigger.reset();
+            meeting.triggerAnnotationInfoEvent(null,{annotation:annotationInfoUpdated});
+            assert.notCalled(TriggerProxy.trigger);
+
+          });
+        });
+
         describe('setUpLocusMediaSharesListener', () => {
           beforeEach(() => {
             meeting.selfId = '9528d952-e4de-46cf-8157-fd4823b98377';
@@ -6179,29 +6223,6 @@ describe('plugin-meetings', () => {
               payloadTestHelper([data1, data2, data3]);
             });
           });
-
-          describe('annotation policy', () => {
-
-            it('Scenario #1: blank annotation', () => {
-              const data1 = generateData(blankPayload, true, true, USER_IDS.ME);
-              const data2 = generateData(data1.payload, false, true, USER_IDS.ME);
-              const data3 = generateData(data2.payload, true, true, USER_IDS.ME);
-              const data4 = generateData(data3.payload, false, true, USER_IDS.ME);
-
-              payloadTestHelper([data1, data2, data3, data4]);
-            });
-
-            it('Scenario #2: annotation', () => {
-              const annotationInfo = {version: '1', policy: 'Approval'};
-              const data1 = generateData(blankPayload, true, true, USER_IDS.ME, annotationInfo);
-              const data2 = generateData(data1.payload, false, true, USER_IDS.ME);
-              const data3 = generateData(data2.payload, true, true, USER_IDS.ME);
-              const data4 = generateData(data3.payload, false, true, USER_IDS.ME);
-
-              payloadTestHelper([data1, data2, data3, data4]);
-            });
-          });
-
           describe('Desktop A --> Desktop B', () => {
             it('Scenario #1: you share desktop A and then share desktop B', () => {
               const data1 = generateData(blankPayload, true, true, USER_IDS.ME);