diff --git a/tracker/tracker/src/main/modules/analytics/events.ts b/tracker/tracker/src/main/modules/analytics/events.ts index 0e4bcbddf..42e7434c9 100644 --- a/tracker/tracker/src/main/modules/analytics/events.ts +++ b/tracker/tracker/src/main/modules/analytics/events.ts @@ -1,8 +1,6 @@ import SharedProperties from './sharedProperties.js' import { isObject } from './utils.js' -const reservedProps = ['distinct_id', 'event_name', 'properties'] - export default class Events { queue: Record = [] sendInterval: ReturnType | null = null @@ -35,7 +33,7 @@ export default class Events { throw new Error('Properties must be an object') } Object.entries(properties).forEach(([key, value]) => { - if (!reservedProps.includes(key)) { + if (!this.sharedProperties.defaultPropertyKeys.includes(key)) { eventProps[key] = value } }) @@ -78,13 +76,13 @@ export default class Events { setProperty = (nameOrProperties: Record | string, value?: any) => { if (isObject(nameOrProperties)) { Object.entries(nameOrProperties).forEach(([key, val]) => { - if (!reservedProps.includes(key)) { + if (!this.sharedProperties.defaultPropertyKeys.includes(key)) { this.ownProperties[key] = val } }) } if (typeof nameOrProperties === 'string' && value !== undefined) { - if (!reservedProps.includes(nameOrProperties)) { + if (!this.sharedProperties.defaultPropertyKeys.includes(nameOrProperties)) { this.ownProperties[nameOrProperties] = value } } diff --git a/tracker/tracker/src/main/modules/analytics/people.ts b/tracker/tracker/src/main/modules/analytics/people.ts index 7668686e4..e9c03303f 100644 --- a/tracker/tracker/src/main/modules/analytics/people.ts +++ b/tracker/tracker/src/main/modules/analytics/people.ts @@ -1,8 +1,6 @@ import SharedProperties from './sharedProperties.js' import { isObject } from './utils.js' -const reservedProps = ['distinct_id', 'event_name', 'properties'] - export default class People { ownProperties: Record = {} user_id: string | null = null @@ -37,7 +35,7 @@ export default class People { throw new Error('Properties must be an object') } Object.entries(properties).forEach(([key, value]) => { - if (!reservedProps.includes(key)) { + if (!this.sharedProperties.defaultPropertyKeys.includes(key)) { this.ownProperties[key] = value } }) @@ -53,7 +51,7 @@ export default class People { throw new Error('Properties must be an object') } Object.entries(properties).forEach(([key, value]) => { - if (!reservedProps.includes(key) && !this.ownProperties[key]) { + if (!this.sharedProperties.defaultPropertyKeys.includes(key) && !this.ownProperties[key]) { this.ownProperties[key] = value } }) @@ -65,7 +63,7 @@ export default class People { * TODO: exported as people.append * */ appendValues = (key: string, value: string | number) => { - if (!reservedProps.includes(key) && this.ownProperties[key]) { + if (!this.sharedProperties.defaultPropertyKeys.includes(key) && this.ownProperties[key]) { if (Array.isArray(this.ownProperties[key])) { this.ownProperties[key].push(value) } else { @@ -96,7 +94,7 @@ export default class People { * TODO: exported as people.increment * */ increment = (key: string, value: number) => { - if (!reservedProps.includes(key) && typeof this.ownProperties[key] === 'number') { + if (!this.sharedProperties.defaultPropertyKeys.includes(key) && typeof this.ownProperties[key] === 'number') { this.ownProperties[key] += value } }