rowan/multi-account-containers
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

streamline metrics init; comments; default values

Browse source
This commit is contained in:
groovecoder 2017-02-14 11:04:40 -06:00
parent dfa55a7a9d
commit d01d89ed60
1 changed files with 12 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
index.js
View file

@ -64,15 +64,13 @@ const ContainerService = {
const object = { const object = {
version: 1, version: 1,
prefs: {}, prefs: {},
metricsUUID: null metricsUUID: uuid.uuid().toString(),
}; };
PREFS.forEach(pref => { PREFS.forEach(pref => {
object.prefs[pref[0]] = prefService.get(pref[0]); object.prefs[pref[0]] = prefService.get(pref[0]);
}); });
object.metricsUUID = uuid.uuid().toString();
ss.storage.savedConfiguration = object; ss.storage.savedConfiguration = object;
} }
@ -82,14 +80,7 @@ const ContainerService = {
prefService.set(pref[0], pref[1]); prefService.set(pref[0], pref[1]);
}); });
if (ss.storage.savedConfiguration.hasOwnProperty("metricsUUID")) {
this._metricsUUID = ss.storage.savedConfiguration.metricsUUID; this._metricsUUID = ss.storage.savedConfiguration.metricsUUID;
} else {
// The add-on was installed before metricsUUID was added, create one
this._metricsUUID = uuid.uuid().toString();
ss.storage.savedConfiguration["metricsUUID"] = this._metricsUUID;
}
// Message routing // Message routing
@ -186,6 +177,7 @@ const ContainerService = {
// utility methods // utility methods
_containerTabCount(userContextId) { _containerTabCount(userContextId) {
// Returns the total of open and hidden tabs with this userContextId
let containerTabsCount = 0; let containerTabsCount = 0;
containerTabsCount += this._identitiesState[userContextId].openTabs; containerTabsCount += this._identitiesState[userContextId].openTabs;
containerTabsCount += this._identitiesState[userContextId].hiddenTabs.length; containerTabsCount += this._identitiesState[userContextId].hiddenTabs.length;
@ -193,6 +185,7 @@ const ContainerService = {
}, },
_totalContainerTabsCount() { _totalContainerTabsCount() {
// Returns the number of total open tabs across ALL containers
let totalContainerTabsCount = 0; let totalContainerTabsCount = 0;
for (const userContextId in this._identitiesState) { for (const userContextId in this._identitiesState) {
totalContainerTabsCount += this._identitiesState[userContextId].openTabs; totalContainerTabsCount += this._identitiesState[userContextId].openTabs;
@ -201,6 +194,7 @@ const ContainerService = {
}, },
_totalNonContainerTabsCount() { _totalNonContainerTabsCount() {
// Returns the number of open tabs NOT IN a container
let totalNonContainerTabsCount = 0; let totalNonContainerTabsCount = 0;
for (const tab of tabs) { for (const tab of tabs) {
if (this._getUserContextIdFromTab(tab) === 0) { if (this._getUserContextIdFromTab(tab) === 0) {
@ -211,6 +205,7 @@ const ContainerService = {
}, },
_shownContainersCount() { _shownContainersCount() {
// Returns the number of containers with at least 1 tab open
let shownContainersCount = 0; let shownContainersCount = 0;
for (const userContextId in this._identitiesState) { for (const userContextId in this._identitiesState) {
if (this._identitiesState[userContextId].openTabs > 0) { if (this._identitiesState[userContextId].openTabs > 0) {
@ -349,13 +344,13 @@ const ContainerService = {
ss.storage.identitiesData = this._identitiesState; ss.storage.identitiesData = this._identitiesState;
}, },
sendTelemetryPayload(params = {}) { sendTelemetryPayload(args = {}) {
// when pings come from popup, delete "method" prop // when pings come from popup, delete "method" prop
delete params.method; delete args.method;
let payload = { // eslint-disable-line prefer-const let payload = { // eslint-disable-line prefer-const
"uuid": this._metricsUUID "uuid": this._metricsUUID
}; };
Object.assign(payload, params); Object.assign(payload, args);
this._sendEvent(payload); this._sendEvent(payload);
}, },
@ -575,14 +570,12 @@ const ContainerService = {
openTab(args) { openTab(args) {
return this._recentBrowserWindow().then(browserWin => { return this._recentBrowserWindow().then(browserWin => {
let userContextId = 0; const userContextId = ("userContextId" in args) ? args.userContextId : 0;
if ("userContextId" in args) { const source = ("source" in args) ? args.source : null;
userContextId = args.userContextId;
}
this.sendTelemetryPayload({ this.sendTelemetryPayload({
"event": "open-tab", "event": "open-tab",
"eventSource": args.source, "eventSource": source,
"userContextId": userContextId, "userContextId": userContextId,
"clickedContainerTabCount": this._containerTabCount(userContextId) "clickedContainerTabCount": this._containerTabCount(userContextId)
}); });