@webex/plugin-meetings 3.0.0-beta.115 → 3.0.0-beta.116

package/dist/types/constants.d.ts

@@ -182,6 +182,7 @@ export declare const EVENT_TRIGGERS: {
     MEETING_STOPPED_SHARING_LOCAL: string;
     MEETING_STARTED_SHARING_REMOTE: string;
     MEETING_STOPPED_SHARING_REMOTE: string;
+    MEETING_UPDATE_ANNOTATION_INFO: string;
     MEETING_STARTED_SHARING_WHITEBOARD: string;
     MEETING_STOPPED_SHARING_WHITEBOARD: string;
     MEETING_MEDIA_LOCAL_STARTED: string;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.115",
+  "version": "3.0.0-beta.116",
   "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.115",
-    "@webex/test-helper-chai": "3.0.0-beta.115",
-    "@webex/test-helper-mocha": "3.0.0-beta.115",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.115",
-    "@webex/test-helper-retry": "3.0.0-beta.115",
-    "@webex/test-helper-test-users": "3.0.0-beta.115",
+    "@webex/plugin-meetings": "3.0.0-beta.116",
+    "@webex/test-helper-chai": "3.0.0-beta.116",
+    "@webex/test-helper-mocha": "3.0.0-beta.116",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.116",
+    "@webex/test-helper-retry": "3.0.0-beta.116",
+    "@webex/test-helper-test-users": "3.0.0-beta.116",
     "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.115",
+    "@webex/common": "3.0.0-beta.116",
     "@webex/internal-media-core": "1.38.0",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.115",
-    "@webex/internal-plugin-device": "3.0.0-beta.115",
-    "@webex/internal-plugin-llm": "3.0.0-beta.115",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.115",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.115",
-    "@webex/internal-plugin-support": "3.0.0-beta.115",
-    "@webex/internal-plugin-user": "3.0.0-beta.115",
-    "@webex/media-helpers": "3.0.0-beta.115",
-    "@webex/plugin-people": "3.0.0-beta.115",
-    "@webex/plugin-rooms": "3.0.0-beta.115",
-    "@webex/webex-core": "3.0.0-beta.115",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.116",
+    "@webex/internal-plugin-device": "3.0.0-beta.116",
+    "@webex/internal-plugin-llm": "3.0.0-beta.116",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.116",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.116",
+    "@webex/internal-plugin-support": "3.0.0-beta.116",
+    "@webex/internal-plugin-user": "3.0.0-beta.116",
+    "@webex/media-helpers": "3.0.0-beta.116",
+    "@webex/plugin-people": "3.0.0-beta.116",
+    "@webex/plugin-rooms": "3.0.0-beta.116",
+    "@webex/webex-core": "3.0.0-beta.116",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/constants.ts

@@ -283,6 +283,7 @@ export const EVENT_TRIGGERS = {
   MEETING_STOPPED_SHARING_LOCAL: 'meeting:stoppedSharingLocal',
   MEETING_STARTED_SHARING_REMOTE: 'meeting:startedSharingRemote',
   MEETING_STOPPED_SHARING_REMOTE: 'meeting:stoppedSharingRemote',
+  MEETING_UPDATE_ANNOTATION_INFO: 'meeting:updateAnnotationInfo',
   MEETING_STARTED_SHARING_WHITEBOARD: 'meeting:startedSharingWhiteboard',
   MEETING_STOPPED_SHARING_WHITEBOARD: 'meeting:stoppedSharingWhiteboard',
   MEETING_MEDIA_LOCAL_STARTED: 'meeting:media:local:start',

package/src/locus-info/mediaSharesUtils.ts

@@ -13,6 +13,7 @@ MediaSharesUtils.parse = (mediaShares: object) => {
       content: {
         beneficiaryId: MediaSharesUtils.getContentBeneficiaryId(mediaShares),
         disposition: MediaSharesUtils.getContentDisposition(mediaShares),
+        annotation: MediaSharesUtils.getContentAnnotation(mediaShares),
       },
       whiteboard: {
         beneficiaryId: MediaSharesUtils.getWhiteboardBeneficiaryId(mediaShares),
@@ -140,6 +141,21 @@ MediaSharesUtils.getContentBeneficiaryId = (mediaShares: object) => {
   return contentFloor.beneficiary.id;
 };
 
+/**
+ * get live annotation is sharing from media shares (content)
+ * @param {Object} mediaShares
+ * @returns {Object}
+ */
+MediaSharesUtils.getContentAnnotation = (mediaShares: object) => {
+  const extractContent = MediaSharesUtils.extractContent(mediaShares);
+
+  if (!extractContent || !extractContent.annotation) {
+    return undefined;
+  }
+
+  return extractContent.annotation;
+};
+
 /**
  * get who is sharing from media shares (whiteboard)
  * @param {Object} mediaShares

package/src/meeting/index.ts

@@ -2188,6 +2188,18 @@ 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
+        );
+      }
+
       if (
         contentShare.beneficiaryId === previousContentShare?.beneficiaryId &&
         contentShare.disposition === previousContentShare?.disposition &&

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

@@ -5863,7 +5863,7 @@ describe('plugin-meetings', () => {
               'https://board-a.wbx2.com/board/api/v1/channels/977a7330-54f4-11eb-b1ef-91f5eefc7bf3',
           };
 
-          const generateContent = (beneficiaryId = null, disposition = null) => ({
+          const generateContent = (beneficiaryId = null, disposition = null,annotation = undefined) => ({
             beneficiaryId,
             disposition,
           });
@@ -5880,7 +5880,8 @@ describe('plugin-meetings', () => {
             beneficiaryId,
             resourceUrl,
             isAccepting,
-            otherBeneficiaryId
+            otherBeneficiaryId,
+            annotation,
           ) => {
             const newPayload = cloneDeep(payload);
 
@@ -5906,7 +5907,7 @@ describe('plugin-meetings', () => {
             if (isGranting) {
               if (isContent) {
                 activeSharingId.content = beneficiaryId;
-                newPayload.current.content = generateContent(beneficiaryId, FLOOR_ACTION.GRANTED);
+                newPayload.current.content = generateContent(beneficiaryId, FLOOR_ACTION.GRANTED,annotation);
 
                 if (isEqual(newPayload.current, newPayload.previous)) {
                   eventTrigger.member = null;
@@ -6533,6 +6534,28 @@ describe('plugin-meetings', () => {
             });
           });
 
+          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);