@sunbird-cb/utils 1.0.4 → 1.0.8

package/bundles/sunbird-cb-utils.umd.js

@@ -1,10 +1,11 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/material/dialog'), require('@angular/material/snack-bar'), require('rxjs'), require('@angular/cdk/layout'), require('rxjs/operators'), require('@angular/common'), require('@angular/material'), require('ngx-image-cropper'), require('keycloak-angular'), require('@angular/common/http'), require('@angular/cdk/platform'), require('moment'), require('lodash'), require('@angular/platform-browser'), require('@angular/router')) :
-    typeof define === 'function' && define.amd ? define('@sunbird-cb/utils', ['exports', '@angular/core', '@angular/material/dialog', '@angular/material/snack-bar', 'rxjs', '@angular/cdk/layout', 'rxjs/operators', '@angular/common', '@angular/material', 'ngx-image-cropper', 'keycloak-angular', '@angular/common/http', '@angular/cdk/platform', 'moment', 'lodash', '@angular/platform-browser', '@angular/router'], factory) :
-    (global = global || self, factory((global['sunbird-cb'] = global['sunbird-cb'] || {}, global['sunbird-cb'].utils = {}), global.ng.core, global.ng.material.dialog, global.ng.material['snack-bar'], global.rxjs, global.ng.cdk.layout, global.rxjs.operators, global.ng.common, global.ng.material, global.ngxImageCropper, global['keycloak-angular'], global.ng.common.http, global.ng.cdk.platform, global.moment, global._, global.ng.platformBrowser, global.ng.router));
-}(this, (function (exports, core, dialog, snackBar, rxjs, layout, operators, common, material, ngxImageCropper, keycloakAngular, http, platform, moment, lodash, platformBrowser, router) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@angular/core'), require('@angular/material/dialog'), require('@angular/material/snack-bar'), require('rxjs'), require('@angular/cdk/layout'), require('rxjs/operators'), require('@angular/common'), require('@angular/material'), require('ngx-image-cropper'), require('keycloak-angular'), require('@angular/common/http'), require('@angular/cdk/platform'), require('@angular/router'), require('moment'), require('lodash'), require('@angular/platform-browser')) :
+    typeof define === 'function' && define.amd ? define('@sunbird-cb/utils', ['exports', '@angular/core', '@angular/material/dialog', '@angular/material/snack-bar', 'rxjs', '@angular/cdk/layout', 'rxjs/operators', '@angular/common', '@angular/material', 'ngx-image-cropper', 'keycloak-angular', '@angular/common/http', '@angular/cdk/platform', '@angular/router', 'moment', 'lodash', '@angular/platform-browser'], factory) :
+    (global = global || self, factory((global['sunbird-cb'] = global['sunbird-cb'] || {}, global['sunbird-cb'].utils = {}), global.ng.core, global.ng.material.dialog, global.ng.material['snack-bar'], global.rxjs, global.ng.cdk.layout, global.rxjs.operators, global.ng.common, global.ng.material, global.ngxImageCropper, global['keycloak-angular'], global.ng.common.http, global.ng.cdk.platform, global.ng.router, global.moment, global._, global.ng.platformBrowser));
+}(this, (function (exports, core, dialog, snackBar, rxjs, layout, operators, common, material, ngxImageCropper, keycloakAngular, http, platform, router, moment, _, platformBrowser) { 'use strict';
 
     moment = moment && moment.hasOwnProperty('default') ? moment['default'] : moment;
+    var ___default = 'default' in _ ? _['default'] : _;
 
     /*! *****************************************************************************
     Copyright (c) Microsoft Corporation.
@@ -2299,10 +2300,31 @@
         IRecursiveData.prototype.children;
     }
     var UtilityService = (function () {
-        function UtilityService(http, platform) {
+        function UtilityService(http, platform, router$1, route) {
+            var _this = this;
             this.http = http;
             this.platform = platform;
+            this.router = router$1;
+            this.route = route;
+            this.currentRouteData = [];
+            this.router.events.subscribe((function (event) {
+                if (event instanceof router.NavigationEnd) {
+                    var snapshot = _this.route.snapshot;
+                    var firstChild = snapshot.root.firstChild;
+                    _this.getChildRouteData(snapshot, firstChild);
+                }
+            }));
         }
+        UtilityService.prototype.getChildRouteData = function (snapshot, firstChild) {
+            if (firstChild) {
+                if (firstChild.data) {
+                    this.currentRouteData.push(firstChild.data);
+                }
+                if (firstChild.firstChild) {
+                    this.getChildRouteData(snapshot, firstChild.firstChild);
+                }
+            }
+        };
         Object.defineProperty(UtilityService.prototype, "randomId", {
             get: function () {
                 return RANDOM_ID_PER_USER + 1;
@@ -2391,6 +2413,28 @@
             enumerable: true,
             configurable: true
         });
+        UtilityService.prototype.setRouteData = function (data) {
+            this.currentRouteData = data;
+        };
+        Object.defineProperty(UtilityService.prototype, "routeData", {
+            get: function () {
+                var data = {
+                    module: '',
+                    pageId: '',
+                };
+                this.currentRouteData.map((function (rd) {
+                    if (rd.pageId) {
+                        data.pageId = data.pageId + "/" + rd.pageId;
+                    }
+                    if (rd.module) {
+                        data.module = rd.module;
+                    }
+                }));
+                return data;
+            },
+            enumerable: true,
+            configurable: true
+        });
         UtilityService.decorators = [
             { type: core.Injectable, args: [{
                         providedIn: 'root',
@@ -2398,14 +2442,19 @@
         ];
         UtilityService.ctorParameters = function () { return [
             { type: http.HttpClient },
-            { type: platform.Platform }
+            { type: platform.Platform },
+            { type: router.Router },
+            { type: router.ActivatedRoute }
         ]; };
-        /** @nocollapse */ UtilityService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function UtilityService_Factory() { return new UtilityService(core.ɵɵinject(http.HttpClient), core.ɵɵinject(platform.Platform)); }, token: UtilityService, providedIn: "root" });
+        /** @nocollapse */ UtilityService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function UtilityService_Factory() { return new UtilityService(core.ɵɵinject(http.HttpClient), core.ɵɵinject(platform.Platform), core.ɵɵinject(router.Router), core.ɵɵinject(router.ActivatedRoute)); }, token: UtilityService, providedIn: "root" });
         return UtilityService;
     }());
     if (false) {
+        UtilityService.prototype.currentRouteData;
         UtilityService.prototype.http;
         UtilityService.prototype.platform;
+        UtilityService.prototype.router;
+        UtilityService.prototype.route;
     }
 
     var LogoutComponent = (function () {
@@ -2921,7 +2970,7 @@
 
     var OrderByPipe = (function () {
         function OrderByPipe() {
-            this.transform = lodash.orderBy;
+            this.transform = _.orderBy;
         }
         OrderByPipe.decorators = [
             { type: core.Pipe, args: [{
@@ -3969,6 +4018,7 @@
             IWsEvents.prototype.to;
             IWsEvents.prototype.data;
             IWsEvents.prototype.passThroughData;
+            IWsEvents.prototype.pageContext;
         }
         var EnumTelemetrySubType;
         (function (EnumTelemetrySubType) {
@@ -3980,11 +4030,34 @@
             EnumTelemetrySubType["HeartBeat"] = "HeartBeat";
             EnumTelemetrySubType["Search"] = "Search";
             EnumTelemetrySubType["Feedback"] = "Feedback";
+            EnumTelemetrySubType["Impression"] = "Impression";
         })(EnumTelemetrySubType = WsEvents.EnumTelemetrySubType || (WsEvents.EnumTelemetrySubType = {}));
+        function ITelemetryPageContext() { }
+        WsEvents.ITelemetryPageContext = ITelemetryPageContext;
+        if (false) {
+            ITelemetryPageContext.prototype.pageId;
+            ITelemetryPageContext.prototype.module;
+            ITelemetryPageContext.prototype.pageIdExt;
+        }
+        function ITelemetryEdata() { }
+        WsEvents.ITelemetryEdata = ITelemetryEdata;
+        if (false) {
+            ITelemetryEdata.prototype.type;
+            ITelemetryEdata.prototype.subType;
+            ITelemetryEdata.prototype.id;
+            ITelemetryEdata.prototype.pageid;
+        }
+        function ITelemetryTabData() { }
+        WsEvents.ITelemetryTabData = ITelemetryTabData;
+        if (false) {
+            ITelemetryTabData.prototype.label;
+            ITelemetryTabData.prototype.index;
+        }
         function IWsEventTelemetry() { }
         WsEvents.IWsEventTelemetry = IWsEventTelemetry;
         if (false) {
             IWsEventTelemetry.prototype.eventSubType;
+            IWsEventTelemetry.prototype.pageContext;
         }
         var EnumTelemetryPdfActivity;
         (function (EnumTelemetryPdfActivity) {
@@ -4006,16 +4079,23 @@
         function IWsEventTelemetryInteract() { }
         WsEvents.IWsEventTelemetryInteract = IWsEventTelemetryInteract;
         if (false) {
-            IWsEventTelemetryInteract.prototype.type;
-            IWsEventTelemetryInteract.prototype.subType;
+            IWsEventTelemetryInteract.prototype.edata;
             IWsEventTelemetryInteract.prototype.object;
+            IWsEventTelemetryInteract.prototype.pageContext;
         }
         function IWsEventTelemetryFeedback() { }
         WsEvents.IWsEventTelemetryFeedback = IWsEventTelemetryFeedback;
         if (false) {
-            IWsEventTelemetryFeedback.prototype.type;
-            IWsEventTelemetryFeedback.prototype.subType;
+            IWsEventTelemetryFeedback.prototype.edata;
             IWsEventTelemetryFeedback.prototype.object;
+            IWsEventTelemetryFeedback.prototype.pageContext;
+        }
+        function IWsEventTelemetryImpression() { }
+        WsEvents.IWsEventTelemetryImpression = IWsEventTelemetryImpression;
+        if (false) {
+            IWsEventTelemetryImpression.prototype.edata;
+            IWsEventTelemetryImpression.prototype.object;
+            IWsEventTelemetryImpression.prototype.pageContext;
         }
         function IWsEventTelemetrySearch() { }
         WsEvents.IWsEventTelemetrySearch = IWsEventTelemetrySearch;
@@ -4067,37 +4147,72 @@
             IWsEventTelemetryMediaData.prototype.maxedSeekedTime;
             IWsEventTelemetryMediaData.prototype.activityStartedAt;
         }
+        var EnumTelemetrymodules;
+        (function (EnumTelemetrymodules) {
+            EnumTelemetrymodules["CONTENT"] = "content";
+            EnumTelemetrymodules["FEEDBACK"] = "feedback";
+            EnumTelemetrymodules["COURSE"] = "course";
+            EnumTelemetrymodules["PROGRAM"] = "program";
+            EnumTelemetrymodules["EXPLORE"] = "explore";
+            EnumTelemetrymodules["LEARN"] = "learn";
+            EnumTelemetrymodules["HOME"] = "home";
+            EnumTelemetrymodules["DASHBOARD"] = "dashboard";
+            EnumTelemetrymodules["SEARCH"] = "search";
+            EnumTelemetrymodules["DISCUSS"] = "discuss";
+            EnumTelemetrymodules["COMPETENCY"] = "competency";
+            EnumTelemetrymodules["EVENTS"] = "events";
+            EnumTelemetrymodules["CAREER"] = "career";
+            EnumTelemetrymodules["PROFILE"] = "profile";
+            EnumTelemetrymodules["NETWORK"] = "network";
+            EnumTelemetrymodules["SUPPORT"] = "support";
+        })(EnumTelemetrymodules = WsEvents.EnumTelemetrymodules || (WsEvents.EnumTelemetrymodules = {}));
+        var EnumInteractTypes;
+        (function (EnumInteractTypes) {
+            EnumInteractTypes["CLICK"] = "click";
+        })(EnumInteractTypes = WsEvents.EnumInteractTypes || (WsEvents.EnumInteractTypes = {}));
+        var EnumInteractSubTypes;
+        (function (EnumInteractSubTypes) {
+            EnumInteractSubTypes["COURSE_TAB"] = "course-tab";
+            EnumInteractSubTypes["CAREER_TAB"] = "career-tab";
+            EnumInteractSubTypes["NETWORK_TAB"] = "network-tab";
+            EnumInteractSubTypes["COMPETENCY_TAB"] = "competency-tab";
+            EnumInteractSubTypes["PROFILE_EDIT_TAB"] = "profile-edit-tab";
+            EnumInteractSubTypes["DISCUSS_TAB"] = "discuss-tab";
+            EnumInteractSubTypes["EVENTS_TAB"] = "events-tab";
+            EnumInteractSubTypes["SIDE_MENU"] = "side-menu";
+        })(EnumInteractSubTypes = WsEvents.EnumInteractSubTypes || (WsEvents.EnumInteractSubTypes = {}));
     })(exports.WsEvents || (exports.WsEvents = {}));
 
     var EventService = (function () {
-        function EventService() {
+        function EventService(utilitySvc) {
+            this.utilitySvc = utilitySvc;
             this.eventsSubject = new rxjs.Subject();
             this.events$ = this.eventsSubject.asObservable();
         }
         EventService.prototype.dispatchEvent = function (event) {
+            event.pageContext = this.getContext(event.pageContext);
             this.eventsSubject.next(event);
         };
-        EventService.prototype.raiseInteractTelemetry = function (type, subType, object, from) {
+        EventService.prototype.raiseInteractTelemetry = function (edata, object, pageContext) {
             this.dispatchEvent({
                 eventType: exports.WsEvents.WsEventType.Telemetry,
                 eventLogLevel: exports.WsEvents.WsEventLogLevel.Info,
                 data: {
-                    type: type,
-                    subType: subType,
+                    edata: edata,
                     object: object,
+                    pageContext: this.getContext(pageContext),
                     eventSubType: exports.WsEvents.EnumTelemetrySubType.Interact,
                 },
-                from: from || '',
+                from: '',
                 to: 'Telemetry',
             });
         };
-        EventService.prototype.raiseFeedbackTelemetry = function (type, subType, object, from) {
+        EventService.prototype.raiseFeedbackTelemetry = function (edata, object, from) {
             this.dispatchEvent({
                 eventType: exports.WsEvents.WsEventType.Telemetry,
                 eventLogLevel: exports.WsEvents.WsEventLogLevel.Info,
                 data: {
-                    type: type,
-                    subType: subType,
+                    edata: edata,
                     object: object,
                     eventSubType: exports.WsEvents.EnumTelemetrySubType.Feedback,
                 },
@@ -4105,18 +4220,69 @@
                 to: 'Telemetry',
             });
         };
+        EventService.prototype.raiseCustomImpression = function (object, pageContext) {
+            this.dispatchEvent({
+                eventType: exports.WsEvents.WsEventType.Telemetry,
+                eventLogLevel: exports.WsEvents.WsEventLogLevel.Info,
+                data: {
+                    object: object,
+                    pageContext: this.getContext(pageContext),
+                    eventSubType: exports.WsEvents.EnumTelemetrySubType.Impression,
+                },
+                from: '',
+                to: 'Telemetry',
+            });
+        };
+        EventService.prototype.getContext = function (pageContext) {
+            var routeDataContext = this.utilitySvc.routeData;
+            var finalContext = {
+                pageId: routeDataContext.pageId,
+                module: routeDataContext.module,
+            };
+            if (pageContext) {
+                if (pageContext.pageIdExt) {
+                    finalContext.pageId = routeDataContext.pageId + "_" + pageContext.pageIdExt;
+                }
+                else if (pageContext.pageId) {
+                    finalContext.pageId = pageContext.pageId;
+                }
+                if (pageContext.module) {
+                    finalContext.module = pageContext.module;
+                }
+            }
+            return finalContext;
+        };
+        EventService.prototype.handleTabTelemetry = function (subType, data, object) {
+            this.raiseInteractTelemetry({
+                subType: subType,
+                type: exports.WsEvents.EnumInteractTypes.CLICK,
+                id: ___default.camelCase(data.label) + "-tab",
+            }, __assign({ context: {
+                    position: data.index,
+                } }, object), {
+                pageIdExt: ___default.camelCase(data.label) + "-tab",
+            });
+            this.raiseCustomImpression(__assign({ context: {
+                    position: data.index,
+                } }, object), {
+                pageIdExt: ___default.camelCase(data.label) + "-tab",
+            });
+        };
         EventService.decorators = [
             { type: core.Injectable, args: [{
                         providedIn: 'root',
                     },] }
         ];
-        EventService.ctorParameters = function () { return []; };
-        /** @nocollapse */ EventService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function EventService_Factory() { return new EventService(); }, token: EventService, providedIn: "root" });
+        EventService.ctorParameters = function () { return [
+            { type: UtilityService }
+        ]; };
+        /** @nocollapse */ EventService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function EventService_Factory() { return new EventService(core.ɵɵinject(UtilityService)); }, token: EventService, providedIn: "root" });
         return EventService;
     }());
     if (false) {
         EventService.prototype.eventsSubject;
         EventService.prototype.events$;
+        EventService.prototype.utilitySvc;
     }
 
     function IWsMsTokenModelResponse() { }
@@ -4342,18 +4508,20 @@
             this.externalApps = {
                 RBCP: 'rbcp-web-ui',
             };
+            this.environment = environment;
             var instanceConfig = this.configSvc.instanceConfig;
             if (instanceConfig) {
                 this.telemetryConfig = instanceConfig.telemetryConfig;
-                this.environment = environment;
                 this.telemetryConfig = __assign({}, this.telemetryConfig, { pdata: __assign({}, this.telemetryConfig.pdata, { id: environment.name + "." + this.telemetryConfig.pdata.id }), uid: this.configSvc.userProfile && this.configSvc.userProfile.userId, channel: this.rootOrgId || this.telemetryConfig.channel, sid: this.getTelemetrySessionId });
                 this.pData = this.telemetryConfig.pdata;
                 this.addPlayerListener();
+                this.addCustomEventListener();
                 this.addInteractListener();
                 this.addFeedbackListener();
                 this.addTimeSpentListener();
                 this.addSearchListener();
                 this.addHearbeatListener();
+                this.addCustomImpressionListener();
             }
         }
         Object.defineProperty(TelemetryService.prototype, "getTelemetrySessionId", {
@@ -4373,17 +4541,20 @@
             enumerable: true,
             configurable: true
         });
-        TelemetryService.prototype.start = function (type, mode, id, data) {
+        TelemetryService.prototype.start = function (edata, data, pageContext) {
             try {
                 if (this.telemetryConfig) {
-                    $t.start(this.telemetryConfig, id, '1.0', {
-                        type: type,
-                        mode: mode,
-                        pageid: id,
+                    $t.start(this.telemetryConfig, (pageContext && pageContext.pageId) ?
+                        pageContext.pageId
+                        : '', '1.0', {
+                        type: edata.type,
+                        mode: edata.mode,
+                        pageid: (pageContext && pageContext.pageId) ?
+                            pageContext.pageId
+                            : '',
+                        duration: 1,
                     }, {
-                        context: {
-                            pdata: __assign({}, this.pData, { id: this.pData.id }),
-                        },
+                        context: __assign({ pdata: __assign({}, this.pData, { id: this.pData.id }) }, (pageContext && pageContext.module ? { env: pageContext.module } : null)),
                         object: __assign({}, (data) && data),
                     });
                 }
@@ -4395,16 +4566,16 @@
                 console.log('Error in telemetry start', e);
             }
         };
-        TelemetryService.prototype.end = function (type, mode, id, data) {
+        TelemetryService.prototype.end = function (edata, data, pageContext) {
             try {
                 $t.end({
-                    type: type,
-                    mode: mode,
-                    pageid: id,
+                    type: edata.type,
+                    mode: edata.mode,
+                    pageid: (pageContext && pageContext.pageId) ?
+                        pageContext.pageId
+                        : '',
                 }, {
-                    context: {
-                        pdata: __assign({}, this.pData, { id: this.pData.id }),
-                    },
+                    context: __assign({ pdata: __assign({}, this.pData, { id: this.pData.id }) }, (pageContext && pageContext.module ? { env: pageContext.module } : null)),
                     object: __assign({}, (data) && data),
                 });
             }
@@ -4444,9 +4615,9 @@
         TelemetryService.prototype.impression = function (data) {
             try {
                 var page = this.getPageDetails();
-                if (data) {
-                    page.pageid = data.pageId;
-                    page.module = data.pageModule;
+                if (data && data.pageContext) {
+                    page.pageid = data.pageContext.pageId;
+                    page.module = data.pageContext.module;
                 }
                 var edata = {
                     pageid: page.pageid,
@@ -4459,9 +4630,7 @@
                             pdata: __assign({}, this.pData, { id: this.pData.id }),
                             env: page.module || (this.telemetryConfig && this.telemetryConfig.env),
                         },
-                        object: {
-                            id: page.objectId,
-                        },
+                        object: __assign({ id: page.objectId }, (data.object)),
                     };
                     $t.impression(edata, config);
                 }
@@ -4469,8 +4638,9 @@
                     $t.impression(edata, {
                         context: {
                             pdata: __assign({}, this.pData, { id: this.pData.id }),
-                            env: page.module,
+                            env: page.module || '',
                         },
+                        object: __assign({}, (data.object)),
                     });
                 }
                 this.previousUrl = page.pageUrl;
@@ -4502,6 +4672,24 @@
                 console.log('Error in telemetry externalImpression', e);
             }
         };
+        TelemetryService.prototype.addCustomImpressionListener = function () {
+            var _this = this;
+            this.eventsSvc.events$
+                .pipe(operators.filter((function (event) {
+                return event &&
+                    event.data &&
+                    event.eventType === exports.WsEvents.WsEventType.Telemetry &&
+                    event.data.eventSubType === exports.WsEvents.EnumTelemetrySubType.Impression;
+            })))
+                .subscribe((function (event) {
+                try {
+                    _this.impression(event.data);
+                }
+                catch (e) {
+                    console.log('Error in telemetry impression', e);
+                }
+            }));
+        };
         TelemetryService.prototype.addTimeSpentListener = function () {
             var _this = this;
             this.eventsSvc.events$
@@ -4514,10 +4702,40 @@
             })))
                 .subscribe((function (event) {
                 if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Loaded) {
-                    _this.start(event.data.type || exports.WsEvents.WsTimeSpentType.Page, event.data.mode || exports.WsEvents.WsTimeSpentMode.View, event.data.pageId);
+                    _this.start({
+                        type: event.data.type || exports.WsEvents.WsTimeSpentType.Player,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, {}, event.pageContext);
                 }
                 if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Unloaded) {
-                    _this.end(event.data.type || exports.WsEvents.WsTimeSpentType.Page, event.data.mode || exports.WsEvents.WsTimeSpentMode.View, event.data.pageId);
+                    _this.end({
+                        type: event.data.type || exports.WsEvents.WsTimeSpentType.Player,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, {}, event.pageContext);
+                }
+            }));
+        };
+        TelemetryService.prototype.addCustomEventListener = function () {
+            var _this = this;
+            this.eventsSvc.events$
+                .pipe(operators.filter((function (event) {
+                return event &&
+                    event.eventType === exports.WsEvents.WsEventType.Telemetry;
+            })))
+                .subscribe((function (event) {
+                if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Loaded &&
+                    event.data.type !== exports.WsEvents.WsTimeSpentType.Player) {
+                    _this.start({
+                        type: event.data.type,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, event.data.object, event.pageContext);
+                }
+                if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Unloaded &&
+                    event.data.type !== exports.WsEvents.WsTimeSpentType.Player) {
+                    _this.end({
+                        type: event.data.type || exports.WsEvents.WsTimeSpentType.Player,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, event.data.object, event.pageContext);
                 }
             }));
         };
@@ -4536,14 +4754,22 @@
                 if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Loaded &&
                     (!content ||
                         (content.isIframeSupported || '').toLowerCase() === 'maybe' ||
-                        (content.isIframeSupported || '').toLowerCase() === 'yes')) {
-                    _this.start(event.data.type || exports.WsEvents.WsTimeSpentType.Player, event.data.mode || exports.WsEvents.WsTimeSpentMode.Play, event.data.identifier, event.data.object);
+                        (content.isIframeSupported || '').toLowerCase() === 'yes' ||
+                        (content.mimeType === 'application/pdf' || 'application/json'))) {
+                    _this.start({
+                        type: event.data.type || exports.WsEvents.WsTimeSpentType.Player,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, event.data.object, event.pageContext);
                 }
                 if (event.data.state === exports.WsEvents.EnumTelemetrySubType.Unloaded &&
                     (!content ||
                         (content.isIframeSupported || '').toLowerCase() === 'maybe' ||
-                        (content.isIframeSupported || '').toLowerCase() === 'yes')) {
-                    _this.end(event.data.type || exports.WsEvents.WsTimeSpentType.Player, event.data.mode || exports.WsEvents.WsTimeSpentMode.Play, event.data.identifier, event.data.object);
+                        (content.isIframeSupported || '').toLowerCase() === 'yes' ||
+                        (content.mimeType === 'application/pdf' || 'application/json'))) {
+                    _this.end({
+                        type: event.data.type || exports.WsEvents.WsTimeSpentType.Player,
+                        mode: event.data.mode || exports.WsEvents.WsTimeSpentMode.Play,
+                    }, event.data.object, event.pageContext);
                 }
             }));
         };
@@ -4572,20 +4798,16 @@
                     }
                 }
                 else {
-                    var interactid = void 0;
-                    if (event.data.type === 'goal') {
-                        interactid = page.pageUrlParts[4];
-                    }
                     try {
                         $t.interact({
-                            type: event.data.type,
-                            subtype: event.data.subType,
-                            id: (event.data.object) ? event.data.object.contentId || event.data.object.id || interactid || '' : '',
-                            pageid: page.pageid,
+                            type: event.data.edata.type,
+                            subtype: event.data.edata.subType,
+                            id: (event.data.edata && event.data.edata.id) ?
+                                event.data.edata.id
+                                : '',
+                            pageid: event.data.pageContext && event.data.pageContext.pageId || page.pageid,
                         }, {
-                            context: {
-                                pdata: __assign({}, _this.pData, { id: _this.pData.id }),
-                            },
+                            context: __assign({ pdata: __assign({}, _this.pData, { id: _this.pData.id }) }, (event.data.pageContext && event.data.pageContext.module ? { env: event.data.pageContext.module } : null)),
                             object: __assign({}, event.data.object),
                         });
                     }
@@ -4618,7 +4840,7 @@
                         },
                         object: {
                             id: event.data.object.contentId || event.data.object.id || '',
-                            type: event.data.type || '',
+                            type: event.data.edata.type || '',
                             ver: "" + (event.data.object.version || '1') + '',
                             rollup: {},
                         },
@@ -4740,8 +4962,8 @@
         TelemetryService.prototype.telemetryConfig;
         TelemetryService.prototype.pData;
         TelemetryService.prototype.contextCdata;
-        TelemetryService.prototype.externalApps;
         TelemetryService.prototype.environment;
+        TelemetryService.prototype.externalApps;
         TelemetryService.prototype.configSvc;
         TelemetryService.prototype.eventsSvc;
         TelemetryService.prototype.logger;