@sunbird-cb/utils 1.0.6 → 1.0.7
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bundles/sunbird-cb-utils.umd.js +63 -59
- package/bundles/sunbird-cb-utils.umd.js.map +1 -1
- package/bundles/sunbird-cb-utils.umd.min.js +1 -1
- package/bundles/sunbird-cb-utils.umd.min.js.map +1 -1
- package/esm2015/lib/services/event.model.js +14 -10
- package/esm2015/lib/services/event.service.js +21 -20
- package/esm2015/lib/services/telemetry.service.js +28 -29
- package/esm2015/lib/services/utility.service.js +1 -1
- package/esm5/lib/services/event.model.js +14 -10
- package/esm5/lib/services/event.service.js +22 -20
- package/esm5/lib/services/telemetry.service.js +31 -32
- package/esm5/lib/services/utility.service.js +1 -1
- package/fesm2015/sunbird-cb-utils.js +60 -56
- package/fesm2015/sunbird-cb-utils.js.map +1 -1
- package/fesm5/sunbird-cb-utils.js +63 -59
- package/fesm5/sunbird-cb-utils.js.map +1 -1
- package/lib/services/event.model.d.ts +9 -5
- package/lib/services/event.service.d.ts +3 -3
- package/lib/services/telemetry.service.d.ts +2 -2
- package/lib/services/utility.service.d.ts +1 -1
- package/package.json +1 -1
- package/sunbird-cb-utils.metadata.json +1 -1
|
@@ -4031,12 +4031,12 @@
|
|
|
4031
4031
|
EnumTelemetrySubType["Feedback"] = "Feedback";
|
|
4032
4032
|
EnumTelemetrySubType["Impression"] = "Impression";
|
|
4033
4033
|
})(EnumTelemetrySubType = WsEvents.EnumTelemetrySubType || (WsEvents.EnumTelemetrySubType = {}));
|
|
4034
|
-
function
|
|
4035
|
-
WsEvents.
|
|
4034
|
+
function ITelemetryPageContext() { }
|
|
4035
|
+
WsEvents.ITelemetryPageContext = ITelemetryPageContext;
|
|
4036
4036
|
if (false) {
|
|
4037
|
-
|
|
4038
|
-
|
|
4039
|
-
|
|
4037
|
+
ITelemetryPageContext.prototype.pageId;
|
|
4038
|
+
ITelemetryPageContext.prototype.module;
|
|
4039
|
+
ITelemetryPageContext.prototype.pageIdExt;
|
|
4040
4040
|
}
|
|
4041
4041
|
function ITelemetryEdata() { }
|
|
4042
4042
|
WsEvents.ITelemetryEdata = ITelemetryEdata;
|
|
@@ -4056,7 +4056,7 @@
|
|
|
4056
4056
|
WsEvents.IWsEventTelemetry = IWsEventTelemetry;
|
|
4057
4057
|
if (false) {
|
|
4058
4058
|
IWsEventTelemetry.prototype.eventSubType;
|
|
4059
|
-
IWsEventTelemetry.prototype.
|
|
4059
|
+
IWsEventTelemetry.prototype.pageContext;
|
|
4060
4060
|
}
|
|
4061
4061
|
var EnumTelemetryPdfActivity;
|
|
4062
4062
|
(function (EnumTelemetryPdfActivity) {
|
|
@@ -4080,21 +4080,21 @@
|
|
|
4080
4080
|
if (false) {
|
|
4081
4081
|
IWsEventTelemetryInteract.prototype.edata;
|
|
4082
4082
|
IWsEventTelemetryInteract.prototype.object;
|
|
4083
|
-
IWsEventTelemetryInteract.prototype.
|
|
4083
|
+
IWsEventTelemetryInteract.prototype.pageContext;
|
|
4084
4084
|
}
|
|
4085
4085
|
function IWsEventTelemetryFeedback() { }
|
|
4086
4086
|
WsEvents.IWsEventTelemetryFeedback = IWsEventTelemetryFeedback;
|
|
4087
4087
|
if (false) {
|
|
4088
4088
|
IWsEventTelemetryFeedback.prototype.edata;
|
|
4089
4089
|
IWsEventTelemetryFeedback.prototype.object;
|
|
4090
|
-
IWsEventTelemetryFeedback.prototype.
|
|
4090
|
+
IWsEventTelemetryFeedback.prototype.pageContext;
|
|
4091
4091
|
}
|
|
4092
4092
|
function IWsEventTelemetryImpression() { }
|
|
4093
4093
|
WsEvents.IWsEventTelemetryImpression = IWsEventTelemetryImpression;
|
|
4094
4094
|
if (false) {
|
|
4095
4095
|
IWsEventTelemetryImpression.prototype.edata;
|
|
4096
4096
|
IWsEventTelemetryImpression.prototype.object;
|
|
4097
|
-
IWsEventTelemetryImpression.prototype.
|
|
4097
|
+
IWsEventTelemetryImpression.prototype.pageContext;
|
|
4098
4098
|
}
|
|
4099
4099
|
function IWsEventTelemetrySearch() { }
|
|
4100
4100
|
WsEvents.IWsEventTelemetrySearch = IWsEventTelemetrySearch;
|
|
@@ -4173,7 +4173,11 @@
|
|
|
4173
4173
|
(function (EnumInteractSubTypes) {
|
|
4174
4174
|
EnumInteractSubTypes["COURSE_TAB"] = "course-tab";
|
|
4175
4175
|
EnumInteractSubTypes["CAREER_TAB"] = "career-tab";
|
|
4176
|
+
EnumInteractSubTypes["NETWORK_TAB"] = "network-tab";
|
|
4177
|
+
EnumInteractSubTypes["COMPETENCY_TAB"] = "competency-tab";
|
|
4176
4178
|
EnumInteractSubTypes["PROFILE_EDIT_TAB"] = "profile-edit-tab";
|
|
4179
|
+
EnumInteractSubTypes["DISCUSS_TAB"] = "discuss-tab";
|
|
4180
|
+
EnumInteractSubTypes["EVENTS_TAB"] = "events-tab";
|
|
4177
4181
|
EnumInteractSubTypes["SIDE_MENU"] = "side-menu";
|
|
4178
4182
|
})(EnumInteractSubTypes = WsEvents.EnumInteractSubTypes || (WsEvents.EnumInteractSubTypes = {}));
|
|
4179
4183
|
})(exports.WsEvents || (exports.WsEvents = {}));
|
|
@@ -4187,14 +4191,14 @@
|
|
|
4187
4191
|
EventService.prototype.dispatchEvent = function (event) {
|
|
4188
4192
|
this.eventsSubject.next(event);
|
|
4189
4193
|
};
|
|
4190
|
-
EventService.prototype.raiseInteractTelemetry = function (edata, object,
|
|
4194
|
+
EventService.prototype.raiseInteractTelemetry = function (edata, object, pageContext) {
|
|
4191
4195
|
this.dispatchEvent({
|
|
4192
4196
|
eventType: exports.WsEvents.WsEventType.Telemetry,
|
|
4193
4197
|
eventLogLevel: exports.WsEvents.WsEventLogLevel.Info,
|
|
4194
4198
|
data: {
|
|
4195
4199
|
edata: edata,
|
|
4196
4200
|
object: object,
|
|
4197
|
-
|
|
4201
|
+
pageContext: this.getContext(pageContext),
|
|
4198
4202
|
eventSubType: exports.WsEvents.EnumTelemetrySubType.Interact,
|
|
4199
4203
|
},
|
|
4200
4204
|
from: '',
|
|
@@ -4214,50 +4218,51 @@
|
|
|
4214
4218
|
to: 'Telemetry',
|
|
4215
4219
|
});
|
|
4216
4220
|
};
|
|
4217
|
-
EventService.prototype.raiseCustomImpression = function (
|
|
4221
|
+
EventService.prototype.raiseCustomImpression = function (object, pageContext) {
|
|
4218
4222
|
this.dispatchEvent({
|
|
4219
4223
|
eventType: exports.WsEvents.WsEventType.Telemetry,
|
|
4220
4224
|
eventLogLevel: exports.WsEvents.WsEventLogLevel.Info,
|
|
4221
4225
|
data: {
|
|
4222
|
-
|
|
4226
|
+
object: object,
|
|
4227
|
+
pageContext: this.getContext(pageContext),
|
|
4223
4228
|
eventSubType: exports.WsEvents.EnumTelemetrySubType.Impression,
|
|
4224
4229
|
},
|
|
4225
4230
|
from: '',
|
|
4226
4231
|
to: 'Telemetry',
|
|
4227
4232
|
});
|
|
4228
4233
|
};
|
|
4229
|
-
EventService.prototype.getContext = function (
|
|
4234
|
+
EventService.prototype.getContext = function (pageContext) {
|
|
4230
4235
|
var routeDataContext = this.utilitySvc.routeData;
|
|
4231
4236
|
var finalContext = {
|
|
4232
4237
|
pageId: routeDataContext.pageId,
|
|
4233
4238
|
module: routeDataContext.module,
|
|
4234
4239
|
};
|
|
4235
|
-
if (
|
|
4236
|
-
if (
|
|
4237
|
-
finalContext.pageId = routeDataContext.pageId + "_" +
|
|
4240
|
+
if (pageContext) {
|
|
4241
|
+
if (pageContext.pageIdExt) {
|
|
4242
|
+
finalContext.pageId = routeDataContext.pageId + "_" + pageContext.pageIdExt;
|
|
4238
4243
|
}
|
|
4239
|
-
else if (
|
|
4240
|
-
finalContext.pageId =
|
|
4244
|
+
else if (pageContext.pageId) {
|
|
4245
|
+
finalContext.pageId = pageContext.pageId;
|
|
4241
4246
|
}
|
|
4242
|
-
if (
|
|
4243
|
-
finalContext.module =
|
|
4247
|
+
if (pageContext.module) {
|
|
4248
|
+
finalContext.module = pageContext.module;
|
|
4244
4249
|
}
|
|
4245
4250
|
}
|
|
4246
4251
|
return finalContext;
|
|
4247
4252
|
};
|
|
4248
|
-
EventService.prototype.handleTabTelemetry = function (subType, data) {
|
|
4253
|
+
EventService.prototype.handleTabTelemetry = function (subType, data, object) {
|
|
4249
4254
|
this.raiseInteractTelemetry({
|
|
4250
4255
|
subType: subType,
|
|
4251
4256
|
type: exports.WsEvents.EnumInteractTypes.CLICK,
|
|
4252
|
-
|
|
4253
|
-
|
|
4254
|
-
context: {
|
|
4257
|
+
id: ___default.camelCase(data.label) + "-tab",
|
|
4258
|
+
}, __assign({ context: {
|
|
4255
4259
|
position: data.index,
|
|
4256
|
-
},
|
|
4257
|
-
}, {
|
|
4260
|
+
} }, object), {
|
|
4258
4261
|
pageIdExt: ___default.camelCase(data.label) + "-tab",
|
|
4259
4262
|
});
|
|
4260
|
-
this.raiseCustomImpression({
|
|
4263
|
+
this.raiseCustomImpression(__assign({ context: {
|
|
4264
|
+
position: data.index,
|
|
4265
|
+
} }, object), {
|
|
4261
4266
|
pageIdExt: ___default.camelCase(data.label) + "-tab",
|
|
4262
4267
|
});
|
|
4263
4268
|
};
|
|
@@ -4490,7 +4495,7 @@
|
|
|
4490
4495
|
}
|
|
4491
4496
|
|
|
4492
4497
|
var TelemetryService = (function () {
|
|
4493
|
-
function TelemetryService(configSvc, eventsSvc, logger
|
|
4498
|
+
function TelemetryService(environment, configSvc, eventsSvc, logger) {
|
|
4494
4499
|
this.configSvc = configSvc;
|
|
4495
4500
|
this.eventsSvc = eventsSvc;
|
|
4496
4501
|
this.logger = logger;
|
|
@@ -4501,10 +4506,10 @@
|
|
|
4501
4506
|
this.externalApps = {
|
|
4502
4507
|
RBCP: 'rbcp-web-ui',
|
|
4503
4508
|
};
|
|
4509
|
+
this.environment = environment;
|
|
4504
4510
|
var instanceConfig = this.configSvc.instanceConfig;
|
|
4505
4511
|
if (instanceConfig) {
|
|
4506
4512
|
this.telemetryConfig = instanceConfig.telemetryConfig;
|
|
4507
|
-
this.environment = environment;
|
|
4508
4513
|
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 });
|
|
4509
4514
|
this.pData = this.telemetryConfig.pdata;
|
|
4510
4515
|
this.addPlayerListener();
|
|
@@ -4606,9 +4611,9 @@
|
|
|
4606
4611
|
TelemetryService.prototype.impression = function (data) {
|
|
4607
4612
|
try {
|
|
4608
4613
|
var page = this.getPageDetails();
|
|
4609
|
-
if (data) {
|
|
4610
|
-
page.pageid = data.pageId;
|
|
4611
|
-
page.module = data.module;
|
|
4614
|
+
if (data && data.pageContext) {
|
|
4615
|
+
page.pageid = data.pageContext.pageId;
|
|
4616
|
+
page.module = data.pageContext.module;
|
|
4612
4617
|
}
|
|
4613
4618
|
var edata = {
|
|
4614
4619
|
pageid: page.pageid,
|
|
@@ -4621,9 +4626,7 @@
|
|
|
4621
4626
|
pdata: __assign({}, this.pData, { id: this.pData.id }),
|
|
4622
4627
|
env: page.module || (this.telemetryConfig && this.telemetryConfig.env),
|
|
4623
4628
|
},
|
|
4624
|
-
object: {
|
|
4625
|
-
id: page.objectId,
|
|
4626
|
-
},
|
|
4629
|
+
object: __assign({ id: page.objectId }, (data.object)),
|
|
4627
4630
|
};
|
|
4628
4631
|
$t.impression(edata, config);
|
|
4629
4632
|
}
|
|
@@ -4633,6 +4636,7 @@
|
|
|
4633
4636
|
pdata: __assign({}, this.pData, { id: this.pData.id }),
|
|
4634
4637
|
env: page.module || '',
|
|
4635
4638
|
},
|
|
4639
|
+
object: __assign({}, (data.object)),
|
|
4636
4640
|
});
|
|
4637
4641
|
}
|
|
4638
4642
|
this.previousUrl = page.pageUrl;
|
|
@@ -4664,6 +4668,24 @@
|
|
|
4664
4668
|
console.log('Error in telemetry externalImpression', e);
|
|
4665
4669
|
}
|
|
4666
4670
|
};
|
|
4671
|
+
TelemetryService.prototype.addCustomImpressionListener = function () {
|
|
4672
|
+
var _this = this;
|
|
4673
|
+
this.eventsSvc.events$
|
|
4674
|
+
.pipe(operators.filter((function (event) {
|
|
4675
|
+
return event &&
|
|
4676
|
+
event.data &&
|
|
4677
|
+
event.eventType === exports.WsEvents.WsEventType.Telemetry &&
|
|
4678
|
+
event.data.eventSubType === exports.WsEvents.EnumTelemetrySubType.Impression;
|
|
4679
|
+
})))
|
|
4680
|
+
.subscribe((function (event) {
|
|
4681
|
+
try {
|
|
4682
|
+
_this.impression(event.data);
|
|
4683
|
+
}
|
|
4684
|
+
catch (e) {
|
|
4685
|
+
console.log('Error in telemetry impression', e);
|
|
4686
|
+
}
|
|
4687
|
+
}));
|
|
4688
|
+
};
|
|
4667
4689
|
TelemetryService.prototype.addTimeSpentListener = function () {
|
|
4668
4690
|
var _this = this;
|
|
4669
4691
|
this.eventsSvc.events$
|
|
@@ -4741,9 +4763,9 @@
|
|
|
4741
4763
|
id: (event.data.edata && event.data.edata.id) ?
|
|
4742
4764
|
event.data.edata.id
|
|
4743
4765
|
: '',
|
|
4744
|
-
pageid: event.data.
|
|
4766
|
+
pageid: event.data.pageContext && event.data.pageContext.pageId || page.pageid,
|
|
4745
4767
|
}, {
|
|
4746
|
-
context: __assign({ pdata: __assign({}, _this.pData, { id: _this.pData.id }) }, (event.data.
|
|
4768
|
+
context: __assign({ pdata: __assign({}, _this.pData, { id: _this.pData.id }) }, (event.data.pageContext && event.data.pageContext.module ? { env: event.data.pageContext.module } : null)),
|
|
4747
4769
|
object: __assign({}, event.data.object),
|
|
4748
4770
|
});
|
|
4749
4771
|
}
|
|
@@ -4787,24 +4809,6 @@
|
|
|
4787
4809
|
}
|
|
4788
4810
|
}));
|
|
4789
4811
|
};
|
|
4790
|
-
TelemetryService.prototype.addCustomImpressionListener = function () {
|
|
4791
|
-
var _this = this;
|
|
4792
|
-
this.eventsSvc.events$
|
|
4793
|
-
.pipe(operators.filter((function (event) {
|
|
4794
|
-
return event &&
|
|
4795
|
-
event.data &&
|
|
4796
|
-
event.eventType === exports.WsEvents.WsEventType.Telemetry &&
|
|
4797
|
-
event.data.eventSubType === exports.WsEvents.EnumTelemetrySubType.Impression;
|
|
4798
|
-
})))
|
|
4799
|
-
.subscribe((function (event) {
|
|
4800
|
-
try {
|
|
4801
|
-
_this.impression(event.data.context);
|
|
4802
|
-
}
|
|
4803
|
-
catch (e) {
|
|
4804
|
-
console.log('Error in telemetry impression', e);
|
|
4805
|
-
}
|
|
4806
|
-
}));
|
|
4807
|
-
};
|
|
4808
4812
|
TelemetryService.prototype.addHearbeatListener = function () {
|
|
4809
4813
|
var _this = this;
|
|
4810
4814
|
this.eventsSvc.events$
|
|
@@ -4903,12 +4907,12 @@
|
|
|
4903
4907
|
},] }
|
|
4904
4908
|
];
|
|
4905
4909
|
TelemetryService.ctorParameters = function () { return [
|
|
4910
|
+
{ type: undefined, decorators: [{ type: core.Inject, args: ['environment',] }] },
|
|
4906
4911
|
{ type: ConfigurationsService },
|
|
4907
4912
|
{ type: EventService },
|
|
4908
|
-
{ type: LoggerService }
|
|
4909
|
-
{ type: undefined, decorators: [{ type: core.Inject, args: ['environment',] }] }
|
|
4913
|
+
{ type: LoggerService }
|
|
4910
4914
|
]; };
|
|
4911
|
-
/** @nocollapse */ TelemetryService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function TelemetryService_Factory() { return new TelemetryService(core.ɵɵinject(
|
|
4915
|
+
/** @nocollapse */ TelemetryService.ngInjectableDef = core.ɵɵdefineInjectable({ factory: function TelemetryService_Factory() { return new TelemetryService(core.ɵɵinject("environment"), core.ɵɵinject(ConfigurationsService), core.ɵɵinject(EventService), core.ɵɵinject(LoggerService)); }, token: TelemetryService, providedIn: "root" });
|
|
4912
4916
|
return TelemetryService;
|
|
4913
4917
|
}());
|
|
4914
4918
|
if (false) {
|