@webex/plugin-meetings 3.0.0-beta.175 → 3.0.0-beta.177

package/dist/types/annotation/annotation.types.d.ts

@@ -33,7 +33,6 @@ interface IAnnotationChannel {
     acceptRequest: (approval: any) => undefined | Promise<void>;
     declineRequest: (approval: any) => undefined | Promise<void>;
     closeAnnotation: (requestData: RequestData) => undefined | Promise<void>;
-    changeAnnotationOptions: (remoteShareUrl: any, annotationInfo: any) => undefined | Promise<void>;
     approveAnnotation: (requestData: RequestData) => undefined | Promise<void>;
     cancelApproveAnnotation: (requestData: RequestData, approval: any) => undefined | Promise<void>;
     sendStrokeData: (strokeData: StrokeData) => void;

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

@@ -106,13 +106,6 @@ declare class AnnotationChannel extends WebexPlugin implements IAnnotationChanne
      * @returns {void}
      */
     sendStrokeData: (strokeData: StrokeData) => void;
-    /**
-     * Change annotation options
-     * @param {remoteShareUrl} remoteShareUrl
-     * @param {annotationInfo} annotationInfo
-     * @returns {Promise}
-     */
-    changeAnnotationOptions(remoteShareUrl: any, annotationInfo: any): any;
     /**
      * private encrypted the strokes data
      * @param {string} encryptedContent

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

@@ -158,7 +158,11 @@ export declare enum ScreenShareFloorStatus {
  * @instance
  * @type {Object}
  * @property {Boolean} memberId id of the meeting member that started screen share
+ * @property {String}  url of this content share
+ * @property {String}  shareInstanceId of this content share
+ * @property {Object}  annotation Info of this content share
  * @memberof Meeting
+ *
  */
 /**
  * Meeting Stopped Sharing Remote Event

package/package.json

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

package/src/annotation/annotation.types.ts

@@ -38,8 +38,6 @@ interface IAnnotationChannel {
   acceptRequest: (approval) => undefined | Promise<void>;
   declineRequest: (approval) => undefined | Promise<void>;
   closeAnnotation: (requestData: RequestData) => undefined | Promise<void>;
-  // change annotation privilege
-  changeAnnotationOptions: (remoteShareUrl, annotationInfo) => undefined | Promise<void>;
   // === below is for attendee
   approveAnnotation: (requestData: RequestData) => undefined | Promise<void>;
   cancelApproveAnnotation: (requestData: RequestData, approval) => undefined | Promise<void>;

package/src/annotation/index.ts

@@ -280,21 +280,6 @@ class AnnotationChannel extends WebexPlugin implements IAnnotationChannel {
     );
   };
 
-  /**
-   * Change annotation options
-   * @param {remoteShareUrl} remoteShareUrl
-   * @param {annotationInfo} annotationInfo
-   * @returns {Promise}
-   */
-  public changeAnnotationOptions(remoteShareUrl, annotationInfo) {
-    // @ts-ignore
-    return this.request({
-      method: HTTP_VERBS.PATCH,
-      url: remoteShareUrl,
-      body: annotationInfo,
-    });
-  }
-
   /**
    * private encrypted the strokes data
    * @param {string} encryptedContent

package/src/meeting/index.ts

@@ -295,7 +295,11 @@ export enum ScreenShareFloorStatus {
  * @instance
  * @type {Object}
  * @property {Boolean} memberId id of the meeting member that started screen share
+ * @property {String}  url of this content share
+ * @property {String}  shareInstanceId of this content share
+ * @property {Object}  annotation Info of this content share
  * @memberof Meeting
+ *
  */
 
 /**
@@ -2233,6 +2237,7 @@ export default class Meeting extends StatelessWebexPlugin {
                   memberId: contentShare.beneficiaryId,
                   url: contentShare.url,
                   shareInstanceId: contentShare.shareInstanceId,
+                  annotationInfo: contentShare.annotation,
                 }
               );
             };
@@ -2321,6 +2326,7 @@ export default class Meeting extends StatelessWebexPlugin {
             memberId: contentShare.beneficiaryId,
             url: contentShare.url,
             shareInstanceId: contentShare.shareInstanceId,
+            annotationInfo: contentShare.annotation,
           }
         );
         this.members.locusMediaSharesUpdate(payload);

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

@@ -343,24 +343,6 @@ describe('live-annotation', () => {
         });
       });
 
-      describe('change annotation info by presenter', () => {
-        it('makes change annotation options as expected', async() => {
-          const options =  { annotationInfo:{
-              version: '1',
-              policy: 'AnnotationNotAllowed',
-          }};
-
-          const remoteShareUrl = 'remoteShareUrl';
-          const result = await annotationService.changeAnnotationOptions(remoteShareUrl,options);
-          assert.calledOnceWithExactly(webex.request, {
-              method: 'PATCH',
-              url: 'remoteShareUrl',
-              body: {annotationInfo: { version: '1', policy: 'AnnotationNotAllowed' }}
-          });
-          assert.equal(result, 'REQUEST_RETURN_VALUE')
-        });
-      });
-
 
 
       describe('close annotation', () => {

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

@@ -3831,7 +3831,7 @@ describe('plugin-meetings', () => {
             assert.equal(meeting.mediaProperties.shareVideoTrack, track);
             assert.equal(meeting.mediaProperties.mediaDirection.sendShare, true);
           };
-          
+
           const checkScreenShareAudioPublished = (track) => {
             assert.calledOnce(meeting.requestScreenShareFloor);
 
@@ -3849,27 +3849,27 @@ describe('plugin-meetings', () => {
             assert.calledOnce(meeting.mediaProperties.webrtcMediaConnection.publishTrack);
             checkScreenShareVideoPublished(videoShareTrack);
           });
-          
+
           it('requests screen share floor and publishes the screen share audio track', async () => {
             await meeting.publishTracks({screenShare: {audio: audioShareTrack}});
-            
+
             assert.calledOnce(meeting.mediaProperties.webrtcMediaConnection.publishTrack);
             checkScreenShareAudioPublished(audioShareTrack);
           });
-          
+
           it('does not request screen share floor when publishing video share track if already sharing audio', async () => {
             await meeting.publishTracks({screenShare: {audio: audioShareTrack}});
             assert.calledOnce(meeting.requestScreenShareFloor);
-            
+
             meeting.requestScreenShareFloor.reset();
             await meeting.publishTracks({screenShare: {video: videoShareTrack}});
             assert.notCalled(meeting.requestScreenShareFloor);
           })
-          
+
           it('does not request screen share floor when publishing audio share track if already sharing video', async () => {
             await meeting.publishTracks({screenShare: {video: videoShareTrack}});
             assert.calledOnce(meeting.requestScreenShareFloor);
-            
+
             meeting.requestScreenShareFloor.reset();
             await meeting.publishTracks({screenShare: {audio: audioShareTrack}});
             assert.notCalled(meeting.requestScreenShareFloor);
@@ -4007,26 +4007,26 @@ describe('plugin-meetings', () => {
             assert.calledOnce(meeting.mediaProperties.webrtcMediaConnection.unpublishTrack);
             checkScreenShareVideoUnpublished();
           });
-          
+
           it('un-publishes the screen share audio track correctly', async () => {
             await meeting.unpublishTracks([audioShareTrack]);
-            
+
             assert.calledOnce(meeting.mediaProperties.webrtcMediaConnection.unpublishTrack);
             checkScreenShareAudioUnpublished();
           });
-          
+
           it('releases share floor and sets send direction to false when both screen share tracks are undefined', async () => {
             await meeting.unpublishTracks([videoShareTrack, audioShareTrack]);
-            
+
             assert.calledOnce(meeting.releaseScreenShareFloor);
             assert.equal(meeting.mediaProperties.mediaDirection.sendShare, false);
           });
-          
+
           it('does not release share floor when audio is released and video still exists', async () => {
             await meeting.unpublishTracks([audioShareTrack]);
             assert.notCalled(meeting.releaseScreenShareFloor);
           });
-          
+
           it('does not release share floor when video is released and audio still exists', async () => {
             await meeting.unpublishTracks([videoShareTrack]);
             assert.notCalled(meeting.releaseScreenShareFloor);
@@ -6219,7 +6219,7 @@ describe('plugin-meetings', () => {
                     eventTrigger.share.push({
                       eventName: EVENT_TRIGGERS.MEETING_STARTED_SHARING_REMOTE,
                       functionName: 'remoteShare',
-                      eventPayload: {memberId: beneficiaryId, url, shareInstanceId},
+                      eventPayload: {memberId: beneficiaryId, url, shareInstanceId , annotationInfo:undefined},
                     });
                   }
                 }