From 23d162c84bb6c1da1016e78df60bb7f060bc77da Mon Sep 17 00:00:00 2001 From: Jay Kim Date: Mon, 6 Apr 2020 14:47:51 -0700 Subject: [PATCH 1/3] add trackEvent --- Iterable.ts | 5 +++++ ios/RNIterableAPI/RNIterableAPI.m | 3 ++- ios/RNIterableAPI/ReactIterableAPI.swift | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/Iterable.ts b/Iterable.ts index 052bc2032..41356bf4c 100644 --- a/Iterable.ts +++ b/Iterable.ts @@ -255,6 +255,11 @@ class Iterable { console.log("getInAppMessages"); return RNIterableAPI.getInAppMessages().then((messages: Array) => messages.map (message => {return IterableInAppMessage.fromDict(message)})) } + + static track(event: String, dataFields: any | null) { + console.log("track") + return RNIterableAPI.track(event, dataFields) + } } export { Iterable, IterableConfig, PushServicePlatform, IterableAction, IterableActionContext, IterableAttributionInfo, IterableCommerceItem }; diff --git a/ios/RNIterableAPI/RNIterableAPI.m b/ios/RNIterableAPI/RNIterableAPI.m index 98c0681d4..e4885e84d 100644 --- a/ios/RNIterableAPI/RNIterableAPI.m +++ b/ios/RNIterableAPI/RNIterableAPI.m @@ -55,6 +55,7 @@ @interface RCT_EXTERN_REMAP_MODULE(RNIterableAPI, ReactIterableAPI, NSObject) RCT_EXTERN_METHOD(getInAppMessages: (RCTPromiseResolveBlock) resolve rejecter: (RCTPromiseRejectBlock) reject) -RCT_EXTERN_METHOD(track: (NSString *) event) +RCT_EXTERN_METHOD(track: (NSString *) event + dataFields: (NSDictionary *) dataFields) @end diff --git a/ios/RNIterableAPI/ReactIterableAPI.swift b/ios/RNIterableAPI/ReactIterableAPI.swift index cdfa6de76..505bb8ee2 100644 --- a/ios/RNIterableAPI/ReactIterableAPI.swift +++ b/ios/RNIterableAPI/ReactIterableAPI.swift @@ -185,10 +185,10 @@ class ReactIterableAPI: RCTEventEmitter { resolver(IterableAPI.inAppManager.getMessages().map{ $0.toDict() }) } - @objc(trackEvent:) - func track(event: String) { + @objc(trackEvent:dataFields:) + func track(event: String, dataFields: [AnyHashable: Any]?) { ITBInfo() - IterableAPI.track(event: event) + IterableAPI.track(event: event, dataFields) } private var shouldEmit = false From 9b46520a35868fc90b804cddd54b0e19377ae643 Mon Sep 17 00:00:00 2001 From: Jay Kim Date: Mon, 6 Apr 2020 14:52:53 -0700 Subject: [PATCH 2/3] add trackEvent to index --- index.d.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/index.d.ts b/index.d.ts index 5eac12fb3..6ab1862d3 100644 --- a/index.d.ts +++ b/index.d.ts @@ -15,6 +15,7 @@ export class Iterable { static trackPushOpenWithCampaignId(campaignId: number, templateId: number, messageId: String | null, appAlreadyRunning: Boolean, dataFields: any | null): void static trackPurchase(total: number, items: Array, dataFields: any | null): void static trackInAppOpen(message: IterableInAppMessage, location: IterableInAppLocation): void + static track(event: String, dataFields: any | null): void } export enum PushServicePlatform { From 3d5a82a1a0980dec923ac5fe758bf11bb962ef8c Mon Sep 17 00:00:00 2001 From: Jay Kim Date: Tue, 7 Apr 2020 11:57:40 -0700 Subject: [PATCH 3/3] fix trackEvent call --- Iterable.ts | 6 +++--- index.d.ts | 2 +- ios/RNIterableAPI/RNIterableAPI.m | 2 +- ios/RNIterableAPI/ReactIterableAPI.swift | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/Iterable.ts b/Iterable.ts index 41356bf4c..f65078e1a 100644 --- a/Iterable.ts +++ b/Iterable.ts @@ -256,9 +256,9 @@ class Iterable { return RNIterableAPI.getInAppMessages().then((messages: Array) => messages.map (message => {return IterableInAppMessage.fromDict(message)})) } - static track(event: String, dataFields: any | null) { - console.log("track") - return RNIterableAPI.track(event, dataFields) + static trackEvent(name: String, dataFields: any | null) { + console.log("trackEvent") + return RNIterableAPI.trackEvent(name, dataFields) } } diff --git a/index.d.ts b/index.d.ts index 6ab1862d3..8d6ba0fe9 100644 --- a/index.d.ts +++ b/index.d.ts @@ -15,7 +15,7 @@ export class Iterable { static trackPushOpenWithCampaignId(campaignId: number, templateId: number, messageId: String | null, appAlreadyRunning: Boolean, dataFields: any | null): void static trackPurchase(total: number, items: Array, dataFields: any | null): void static trackInAppOpen(message: IterableInAppMessage, location: IterableInAppLocation): void - static track(event: String, dataFields: any | null): void + static trackEvent(name: String, dataFields: any | null): void } export enum PushServicePlatform { diff --git a/ios/RNIterableAPI/RNIterableAPI.m b/ios/RNIterableAPI/RNIterableAPI.m index e4885e84d..7e9a23ac4 100644 --- a/ios/RNIterableAPI/RNIterableAPI.m +++ b/ios/RNIterableAPI/RNIterableAPI.m @@ -55,7 +55,7 @@ @interface RCT_EXTERN_REMAP_MODULE(RNIterableAPI, ReactIterableAPI, NSObject) RCT_EXTERN_METHOD(getInAppMessages: (RCTPromiseResolveBlock) resolve rejecter: (RCTPromiseRejectBlock) reject) -RCT_EXTERN_METHOD(track: (NSString *) event +RCT_EXTERN_METHOD(trackEvent: (NSString *) name dataFields: (NSDictionary *) dataFields) @end diff --git a/ios/RNIterableAPI/ReactIterableAPI.swift b/ios/RNIterableAPI/ReactIterableAPI.swift index 505bb8ee2..e7d7b7c60 100644 --- a/ios/RNIterableAPI/ReactIterableAPI.swift +++ b/ios/RNIterableAPI/ReactIterableAPI.swift @@ -186,9 +186,9 @@ class ReactIterableAPI: RCTEventEmitter { } @objc(trackEvent:dataFields:) - func track(event: String, dataFields: [AnyHashable: Any]?) { + func trackEvent(name: String, dataFields: [AnyHashable: Any]?) { ITBInfo() - IterableAPI.track(event: event, dataFields) + IterableAPI.trackEvent(name: event, dataFields) } private var shouldEmit = false