@webex/plugin-meetings 3.0.0-beta.385 → 3.0.0-beta.387

package/dist/webinar/index.js

@@ -62,7 +62,7 @@ var Webinar = _webexCore.WebexPlugin.extend({
   updateCanManageWebcast: function updateCanManageWebcast(canManageWebcast) {
     this.set('canManageWebcast', canManageWebcast);
   },
-  version: "3.0.0-beta.385"
+  version: "3.0.0-beta.387"
 });
 var _default = Webinar;
 exports.default = _default;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webex/plugin-meetings",
-  "version": "3.0.0-beta.385",
+  "version": "3.0.0-beta.387",
   "description": "",
   "license": "Cisco EULA (https://www.cisco.com/c/en/us/products/end-user-license-agreement.html)",
   "contributors": [
@@ -33,12 +33,12 @@
   },
   "devDependencies": {
     "@peculiar/webcrypto": "^1.4.3",
-    "@webex/plugin-meetings": "3.0.0-beta.385",
-    "@webex/test-helper-chai": "3.0.0-beta.385",
-    "@webex/test-helper-mocha": "3.0.0-beta.385",
-    "@webex/test-helper-mock-webex": "3.0.0-beta.385",
-    "@webex/test-helper-retry": "3.0.0-beta.385",
-    "@webex/test-helper-test-users": "3.0.0-beta.385",
+    "@webex/plugin-meetings": "3.0.0-beta.387",
+    "@webex/test-helper-chai": "3.0.0-beta.387",
+    "@webex/test-helper-mocha": "3.0.0-beta.387",
+    "@webex/test-helper-mock-webex": "3.0.0-beta.387",
+    "@webex/test-helper-retry": "3.0.0-beta.387",
+    "@webex/test-helper-test-users": "3.0.0-beta.387",
     "chai": "^4.3.4",
     "chai-as-promised": "^7.1.1",
     "jsdom-global": "3.0.2",
@@ -47,19 +47,19 @@
     "typescript": "^4.7.4"
   },
   "dependencies": {
-    "@webex/common": "3.0.0-beta.385",
+    "@webex/common": "3.0.0-beta.387",
     "@webex/internal-media-core": "2.2.9",
-    "@webex/internal-plugin-conversation": "3.0.0-beta.385",
-    "@webex/internal-plugin-device": "3.0.0-beta.385",
-    "@webex/internal-plugin-llm": "3.0.0-beta.385",
-    "@webex/internal-plugin-mercury": "3.0.0-beta.385",
-    "@webex/internal-plugin-metrics": "3.0.0-beta.385",
-    "@webex/internal-plugin-support": "3.0.0-beta.385",
-    "@webex/internal-plugin-user": "3.0.0-beta.385",
-    "@webex/media-helpers": "3.0.0-beta.385",
-    "@webex/plugin-people": "3.0.0-beta.385",
-    "@webex/plugin-rooms": "3.0.0-beta.385",
-    "@webex/webex-core": "3.0.0-beta.385",
+    "@webex/internal-plugin-conversation": "3.0.0-beta.387",
+    "@webex/internal-plugin-device": "3.0.0-beta.387",
+    "@webex/internal-plugin-llm": "3.0.0-beta.387",
+    "@webex/internal-plugin-mercury": "3.0.0-beta.387",
+    "@webex/internal-plugin-metrics": "3.0.0-beta.387",
+    "@webex/internal-plugin-support": "3.0.0-beta.387",
+    "@webex/internal-plugin-user": "3.0.0-beta.387",
+    "@webex/media-helpers": "3.0.0-beta.387",
+    "@webex/plugin-people": "3.0.0-beta.387",
+    "@webex/plugin-rooms": "3.0.0-beta.387",
+    "@webex/webex-core": "3.0.0-beta.387",
     "ampersand-collection": "^2.0.2",
     "bowser": "^2.11.0",
     "btoa": "^1.2.1",

package/src/locus-info/mediaSharesUtils.ts

@@ -17,6 +17,7 @@ MediaSharesUtils.parse = (mediaShares: object) => {
         url: MediaSharesUtils.getContentUrl(mediaShares),
         shareInstanceId: MediaSharesUtils.getShareInstanceId(mediaShares),
         deviceUrlSharing: MediaSharesUtils.getContentBeneficiaryDeviceUrl(mediaShares),
+        resourceType: MediaSharesUtils.getContentResourceType(mediaShares),
       },
       whiteboard: {
         beneficiaryId: MediaSharesUtils.getWhiteboardBeneficiaryId(mediaShares),
@@ -159,6 +160,21 @@ MediaSharesUtils.getContentAnnotation = (mediaShares: object) => {
   return extractContent.annotation;
 };
 
+/**
+ * get live resourceType is sharing from media shares (content)
+ * @param {Object} mediaShares
+ * @returns {Object}
+ */
+MediaSharesUtils.getContentResourceType = (mediaShares: object) => {
+  const extractContent = MediaSharesUtils.extractContent(mediaShares);
+
+  if (!extractContent || !extractContent.resourceType) {
+    return undefined;
+  }
+
+  return extractContent.resourceType;
+};
+
 /**
  * get url is sharing from media shares (content)
  * @param {Object} mediaShares

package/src/meeting/index.ts

@@ -2393,6 +2393,7 @@ export default class Meeting extends StatelessWebexPlugin {
         {
           annotationInfo: contentShare?.annotation,
           meetingId: this.id,
+          resourceType: contentShare?.resourceType,
         }
       );
     }
@@ -2543,6 +2544,7 @@ export default class Meeting extends StatelessWebexPlugin {
                   url: contentShare.url,
                   shareInstanceId: this.remoteShareInstanceId,
                   annotationInfo: contentShare.annotation,
+                  resourceType: contentShare.resourceType,
                 }
               );
             };
@@ -2635,6 +2637,7 @@ export default class Meeting extends StatelessWebexPlugin {
             url: contentShare.url,
             shareInstanceId: this.remoteShareInstanceId,
             annotationInfo: contentShare.annotation,
+            resourceType: contentShare.resourceType,
           }
         );
         this.members.locusMediaSharesUpdate(payload);

package/test/unit/spec/locus-info/mediaSharesUtils.ts

@@ -20,6 +20,15 @@ describe('getContentUrl', () => {
   });
 });
 
+describe('getContentResourceType', () => {
+  it('getContentResourceType return correct resourceType value', () => {
+    const stub = Sinon.stub(MediaSharesUtils, 'extractContent').returns({resourceType:'resourceType'});
+    const resourceType = MediaSharesUtils.getContentResourceType();
+    assert.equal(resourceType,'resourceType');
+    stub.restore();
+  });
+});
+
 describe('getContentBeneficiaryDeviceUrl', () => {
   it('getContentBeneficiaryDeviceUrl return correct deviceUrl value', () => {
     const mockContentBeneficiaryDeviceUrl = "https://wdm-a.wbx2.com/wdm/api/v1/devices/e9ffd8a1-1fae-42d1-afbe-013e951f93ab"

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

@@ -9199,9 +9199,9 @@ describe('plugin-meetings', () => {
           it('check triggerAnnotationInfoEvent event', () => {
             TriggerProxy.trigger.reset();
             const annotationInfo = {version: '1', policy: 'Approval'};
-            const expectAnnotationInfo = {annotationInfo, meetingId: meeting.id};
+            const expectAnnotationInfo = {annotationInfo, meetingId: meeting.id, resourceType: 'FILE'};
             meeting.webex.meetings = {};
-            meeting.triggerAnnotationInfoEvent({annotation: annotationInfo}, {});
+            meeting.triggerAnnotationInfoEvent({annotation: annotationInfo, resourceType: 'FILE'}, {});
             assert.calledWith(
               TriggerProxy.trigger,
               {},
@@ -9215,8 +9215,8 @@ describe('plugin-meetings', () => {
 
             TriggerProxy.trigger.reset();
             meeting.triggerAnnotationInfoEvent(
-              {annotation: annotationInfo},
-              {annotation: annotationInfo}
+              {annotation: annotationInfo, resourceType: 'FILE'},
+              {annotation: annotationInfo, resourceType: 'FILE'}
             );
             assert.notCalled(TriggerProxy.trigger);
 
@@ -9225,10 +9225,11 @@ describe('plugin-meetings', () => {
             const expectAnnotationInfoUpdated = {
               annotationInfo: annotationInfoUpdate,
               meetingId: meeting.id,
+              resourceType: 'FILE',
             };
             meeting.triggerAnnotationInfoEvent(
-              {annotation: annotationInfoUpdate},
-              {annotation: annotationInfo}
+              {annotation: annotationInfoUpdate, resourceType: 'FILE'},
+              {annotation: annotationInfo, resourceType: 'FILE'}
             );
             assert.calledWith(
               TriggerProxy.trigger,
@@ -9242,7 +9243,7 @@ describe('plugin-meetings', () => {
             );
 
             TriggerProxy.trigger.reset();
-            meeting.triggerAnnotationInfoEvent(null, {annotation: annotationInfoUpdate});
+            meeting.triggerAnnotationInfoEvent(null, {annotation: annotationInfoUpdate, resourceType: 'FILE'});
             assert.notCalled(TriggerProxy.trigger);
           });
         });
@@ -9277,11 +9278,14 @@ describe('plugin-meetings', () => {
             beneficiaryId = null,
             disposition = null,
             deviceUrlSharing = null,
-            annotation = undefined
+            annotation = undefined,
+            resourceType = undefined,
           ) => ({
             beneficiaryId,
             disposition,
             deviceUrlSharing,
+            annotation,
+            resourceType,
           });
           const generateWhiteboard = (
             beneficiaryId = null,
@@ -9300,7 +9304,8 @@ describe('plugin-meetings', () => {
             annotation,
             url,
             shareInstanceId,
-            deviceUrlSharing
+            deviceUrlSharing,
+            resourceType
           ) => {
             const newPayload = cloneDeep(payload);
 
@@ -9334,7 +9339,8 @@ describe('plugin-meetings', () => {
                   beneficiaryId,
                   FLOOR_ACTION.GRANTED,
                   deviceUrlSharing,
-                  annotation
+                  annotation,
+                    resourceType
                 );
 
                 if (isEqual(newPayload.current, newPayload.previous)) {
@@ -9395,6 +9401,7 @@ describe('plugin-meetings', () => {
                         url,
                         shareInstanceId,
                         annotationInfo: undefined,
+                        resourceType: undefined
                       },
                     });
                   }
@@ -10236,7 +10243,8 @@ describe('plugin-meetings', () => {
                 undefined,
                 undefined,
                 undefined,
-                DEVICE_URL.REMOTE_A
+                DEVICE_URL.REMOTE_A,
+                undefined
               );
               const data2 = generateData(
                 data1.payload,
@@ -10249,9 +10257,10 @@ describe('plugin-meetings', () => {
                 undefined,
                 undefined,
                 undefined,
-                DEVICE_URL.REMOTE_B
+                DEVICE_URL.REMOTE_B,
+                undefined
               );
-              const data3 = generateData(data2.payload, false, true, USER_IDS.REMOTE_B);
+              const data3 = generateData(data2.payload, false, true, USER_IDS.REMOTE_B, undefined);
 
               payloadTestHelper([data1, data2, data3]);
             });