@blueconic/blueconic-react-native 3.1.0 → 3.2.1

package/CHANGELOG.md

@@ -2,6 +2,16 @@
 All notable changes to this project will be documented in this file.
 `@blueconic/blueconic-react-native` adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [3.2.1] 2024-06-14
+
+### Fixed
+- React-Android: Fixed issue with behaviour listener not processing values correctly in rule sets.
+
+## [3.2.0] 2024-06-14
+
+### Added
+- Added support for timeline events in the SDK.
+
 ## [3.1.0] 2024-03-12
 
 ### Added

package/android/build.gradle

@@ -19,10 +19,10 @@ android {
     defaultConfig {
         minSdkVersion 21
         targetSdkVersion 33
-        versionCode 300
-        versionName "3.1.0"
+        versionCode 320
+        versionName "3.2.1"
         buildConfigField 'String', 'PLATFORM_NAME', "\"React Native\""
-        buildConfigField 'String', 'PLATFORM_VERSION', "\"3.1.0\""
+        buildConfigField 'String', 'PLATFORM_VERSION', "\"3.2.1\""
     }
     lintOptions {
         abortOnError false
@@ -36,5 +36,5 @@ repositories {
 
 dependencies {
     compileOnly 'com.facebook.react:react-android:+'
-    implementation 'com.blueconic:blueconic-android-lib:5.1.0'
+    implementation 'com.blueconic:blueconic-android-lib:5.2.2'
 }

package/android/src/main/java/com/blueconic/reactnative/BlueConicClientModule.java

@@ -22,12 +22,7 @@ import com.facebook.react.bridge.WritableNativeArray;
 import com.facebook.react.bridge.WritableNativeMap;
 import com.facebook.react.modules.core.DeviceEventManagerModule;
 
-import java.util.Map;
-import java.util.HashMap;
-import java.util.Collections;
-import java.util.Collection;
-import java.util.List;
-import java.util.ArrayList;
+import java.util.*;
 
 import javax.annotation.Nonnull;
 
@@ -610,7 +605,6 @@ public class BlueConicClientModule extends ReactContextBaseJavaModule {
     callback.invoke(Arguments.createArray());
   }
 
-
   /**
    * Update sync the BlueConic Profile
    */
@@ -750,6 +744,142 @@ public class BlueConicClientModule extends ReactContextBaseJavaModule {
     }
   }
 
+  /**
+   * Create Timeline Event.
+   * @param eventType The type of event
+   * @param eventDate The date of the event
+   * @param readableMap The readable map retrieved from React native
+   */
+  @ReactMethod
+  public void registerTimelineEvent(@Nonnull String eventType, double eventDate, ReadableMap readableMap) {
+    final BlueConicClient blueConicClient = getBlueConicClientInstance();
+    final Map<String, Object> properties = readableMap.toHashMap();
+
+    if (blueConicClient != null) {
+      blueConicClient.createTimelineEvent(eventType, new Date((long) eventDate), properties, null);
+    }
+  }
+
+  /**
+   * Create Timeline Event.
+   * @param eventType The type of event
+   * @param eventDate The date of the event
+   * @param readableMap The readable map retrieved from React native
+   * @param promise The promise to handle the obtained value. Promises are necessary in Native Modules
+   * Native Modules to pass values back to the JavaScript.
+   */
+  @ReactMethod
+  public void registerTimelineEventSync(@Nonnull String eventType, double eventDate, ReadableMap readableMap, @Nonnull final Promise promise) {
+    final BlueConicClient blueConicClient = getBlueConicClientInstance();
+    final Map<String, Object> properties = readableMap.toHashMap();
+
+    if (blueConicClient != null) {
+      blueConicClient.createTimelineEvent(eventType, new Date((long) eventDate), properties, new Runnable() {
+        @Override
+        public void run() {
+          promise.resolve(Arguments.createArray());
+        }
+      });
+      return;
+    }
+
+    promise.resolve(Arguments.createArray());
+  }
+
+  /**
+   * Create Timeline Event.
+   * @param eventType The type of event
+   * @param eventDate The date of the event
+   * @param readableMap The readable map retrieved from React native
+   * @param callback   The Callback function to handle the obtained values. Callbacks are necessary in Native Modules
+   *                   to pass values back to the JavaScript.
+   */
+  @ReactMethod
+  public void registerTimelineEventSyncWithCallback(@Nonnull String eventType, double eventDate, ReadableMap readableMap, @Nonnull final Callback callback) {
+    final BlueConicClient blueConicClient = getBlueConicClientInstance();
+    final Map<String, Object> properties = readableMap.toHashMap();
+
+    if (blueConicClient != null) {
+      blueConicClient.createTimelineEvent(eventType, new Date((long) eventDate), properties, new Runnable() {
+        @Override
+        public void run() {
+          callback.invoke(Arguments.createArray());
+        }
+      });
+      return;
+    }
+
+    callback.invoke(Arguments.createArray());
+  }
+
+  /**
+   * Create Timeline Event.
+   * @param eventType The type of event
+   * @param eventDate The date of the event
+   * @param readableMap The readable map retrieved from React native
+   */
+  @ReactMethod
+  public void registerTimelineEventById(@Nonnull String eventId, @Nonnull String eventType, double eventDate, ReadableMap readableMap) {
+    final BlueConicClient blueConicClient = getBlueConicClientInstance();
+    final Map<String, Object> properties = readableMap.toHashMap();
+
+    if (blueConicClient != null) {
+      blueConicClient.createTimelineEventById(eventId, eventType, new Date((long) eventDate), properties, null);
+    }
+  }
+
+  /**
+   * Create Timeline Event.
+   * @param eventType The type of event
+   * @param eventDate The date of the event
+   * @param readableMap The readable map retrieved from React native
+   * @param promise The promise to handle the obtained value. Promises are necessary in Native Modules
+   * Native Modules to pass values back to the JavaScript.
+   */
+  @ReactMethod
+  public void registerTimelineEventByIdSync(@Nonnull String eventId, @Nonnull String eventType, double eventDate, ReadableMap readableMap, @Nonnull final Promise promise) {
+    final BlueConicClient blueConicClient = getBlueConicClientInstance();
+    final Map<String, Object> properties = readableMap.toHashMap();
+
+    if (blueConicClient != null) {
+      blueConicClient.createTimelineEventById(eventId, eventType, new Date((long) eventDate), properties, new Runnable() {
+        @Override
+        public void run() {
+          promise.resolve(Arguments.createArray());
+        }
+      });
+      return;
+    }
+
+    promise.resolve(Arguments.createArray());
+  }
+
+  /**
+   * Create Timeline Event.
+   * @param eventType The type of event
+   * @param eventDate The date of the event
+   * @param readableMap The readable map retrieved from React native
+   * @param callback   The Callback function to handle the obtained values. Callbacks are necessary in Native Modules
+   *                   to pass values back to the JavaScript.
+   */
+  @ReactMethod
+  public void registerTimelineEventByIdSyncWithCallback(@Nonnull String eventId, @Nonnull String eventType, double eventDate, ReadableMap readableMap, @Nonnull final Callback callback) {
+    final BlueConicClient blueConicClient = getBlueConicClientInstance();
+    final Map<String, Object> properties = readableMap.toHashMap();
+
+    if (blueConicClient != null) {
+      blueConicClient.createTimelineEventById(eventId, eventType, new Date((long) eventDate), properties, new Runnable() {
+        @Override
+        public void run() {
+          callback.invoke(Arguments.createArray());
+        }
+      });
+      return;
+    }
+
+    callback.invoke(Arguments.createArray());
+  }
+
   /**
    * Creates a ClickEvent for the given selector and publishes the event to BlueConic using the EventManager.
    * @param selector The selector to identify the clicked component.
@@ -865,7 +995,7 @@ public class BlueConicClientModule extends ReactContextBaseJavaModule {
       BlueConicClient instance = BlueConicClientFactory.INSTANCE.getInstance(currentActivity);
       //Set platform information
       BlueConicClientImpl implInstance = (BlueConicClientImpl) instance;
-      //implInstance.setPlatformInformation(BuildConfig.PLATFORM_NAME, BuildConfig.PLATFORM_VERSION);
+      implInstance.setPlatformInformation(BuildConfig.PLATFORM_NAME, BuildConfig.PLATFORM_VERSION);
       return instance;
     }
 

package/ios/BlueConicClientModule.m

@@ -55,7 +55,7 @@ RCT_EXTERN_METHOD(hasSegmentWithCallback:(NSString *)segmentId withCallback:(RCT
 
 RCT_EXTERN_METHOD(createEvent:(NSString *)eventName withProperties:(NSDictionary *)properties)
 RCT_EXTERN_METHOD(createEventSync:(NSString *)eventName withProperties:(NSDictionary *)properties withResolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
-RCT_EXTERN_METHOD(createEventSyncWithCallback:eventName withProperties:(NSDictionary *)properties withCallback:(RCTResponseSenderBlock)callback)
+RCT_EXTERN_METHOD(createEventSyncWithCallback:(NSString *)eventName withProperties:(NSDictionary *)properties withCallback:(RCTResponseSenderBlock)callback)
 
 RCT_EXTERN_METHOD(updateProfile)
 RCT_EXTERN_METHOD(updateProfileSync:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
@@ -65,6 +65,14 @@ RCT_EXTERN_METHOD(registerPageView:(NSString *)screenName)
 RCT_EXTERN_METHOD(registerPageViewSync:(NSString *)screenName withResolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(registerPageViewSyncWithCallback:(NSString *)screenName withCallback:(RCTResponseSenderBlock)callback)
 
+RCT_EXTERN_METHOD(registerTimelineEvent:(NSString *)eventType withDate:(NSDate *)eventDate withProperties:(NSDictionary *)properties)
+RCT_EXTERN_METHOD(registerTimelineEventSync:(NSString *)eventType withDate:(NSDate *)eventDate withProperties:(NSDictionary *)properties withResolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(registerTimelineEventSyncWithCallback:(NSString *)eventType withDate:(NSDate *)eventDate withProperties:(NSDictionary *)properties withCallback:(RCTResponseSenderBlock)callback)
+
+RCT_EXTERN_METHOD(registerTimelineEventById:(NSString *)eventId withType:(NSString *)eventType withDate:(NSDate *)eventDate withProperties:(NSDictionary *)properties)
+RCT_EXTERN_METHOD(registerTimelineEventByIdSync:(NSString *)eventId withType:(NSString *)eventType withDate:(NSDate *)eventDate withProperties:(NSDictionary *)properties withResolver:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
+RCT_EXTERN_METHOD(registerTimelineEventByIdSyncWithCallback:(NSString *)eventId withType:(NSString *)eventType withDate:(NSDate *)eventDate withProperties:(NSDictionary *)properties withCallback:(RCTResponseSenderBlock)callback)
+
 RCT_EXTERN_METHOD(registerClickEvent:(NSString *)selector)
 RCT_EXTERN_METHOD(registerClickEventWithContext:(NSString *)selector withValues:(NSArray *)values)
 RCT_EXTERN_METHOD(registerFormSubmitEvent:(NSString *)selector)

package/ios/BlueConicClientModule.swift

@@ -1,4 +1,5 @@
 import UIKit
+import Foundation
 import BlueConicClient
 
 /**
@@ -8,7 +9,7 @@ import BlueConicClient
 @objc(BlueConicClientModule)
 class BlueConicClientModule: RCTEventEmitter {
     private static var platformName: String = "React Native"
-    private static var platformVersion: String = "3.1.0"
+    private static var platformVersion: String = "3.2.0"
     private static var moduleInstance: BlueConicClientModule?
     private static var hasListeners: Bool?
 
@@ -381,6 +382,40 @@ class BlueConicClientModule: RCTEventEmitter {
         })
     }
 
+    /**
+     Calls the createTimelineEvent method of the BlueConicClient.
+     */
+    @objc func registerTimelineEvent(_ eventType: String, withDate eventDate: Date, withProperties properties: [String: Any]) -> Void {
+        self.getBlueConicClientInstance().createTimelineEvent(eventType, eventDate: eventDate, properties: properties)
+    }
+    @objc func registerTimelineEventSync(_ eventType: String, withDate eventDate: Date, withProperties properties: [String: Any], withResolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject:  @escaping RCTPromiseRejectBlock) -> Void {
+        self.getBlueConicClientInstance().createTimelineEvent(eventType, eventDate: eventDate, properties: properties, completion: {
+            resolve([])
+        })
+    }
+    @objc func registerTimelineEventSyncWithCallback(_ eventType: String, withDate eventDate: Date, withProperties properties: [String: Any], withCallback callback: @escaping RCTResponseSenderBlock) -> Void {
+        self.getBlueConicClientInstance().createTimelineEvent(eventType, eventDate: eventDate, properties: properties, completion: {
+            callback([])
+        })
+    }
+
+    /**
+     Calls the createTimelineEventById method of the BlueConicClient.
+     */
+    @objc func registerTimelineEventById(_ eventId: String, withType eventType: String, withDate eventDate: Date, withProperties properties: [String: Any]) -> Void {
+        self.getBlueConicClientInstance().createTimelineEventById(eventId, eventType: eventType, eventDate: eventDate, properties: properties)
+    }
+    @objc func registerTimelineEventByIdSync(_ eventId: String, withType eventType: String, withDate eventDate: Date, withProperties properties: [String: Any], withResolver resolve: @escaping RCTPromiseResolveBlock, rejecter reject:  @escaping RCTPromiseRejectBlock) -> Void {
+        self.getBlueConicClientInstance().createTimelineEventById(eventId, eventType: eventType, eventDate: eventDate, properties: properties, completion: {
+            resolve([])
+        })
+    }
+    @objc func registerTimelineEventByIdSyncWithCallback(_ eventId: String, withType eventType: String, withDate eventDate: Date, withProperties properties: [String: Any], withCallback callback: @escaping RCTResponseSenderBlock) -> Void {
+        self.getBlueConicClientInstance().createTimelineEventById(eventId, eventType: eventType, eventDate: eventDate, properties: properties, completion: {
+            callback([])
+        })
+    }
+
     /**
      Creates a ClickEvent for the given selector and publishes the event to BlueConic using the EventManager.
      - parameter selector: The selector to identify the clicked component.
@@ -466,7 +501,7 @@ class BlueConicClientModule: RCTEventEmitter {
     */
     private func getBlueConicClientInstance() -> BlueConic {
         let instance = BlueConic.getInstance()
-        //BlueConic.setPlatformInformation(platformName: BlueConicClientModule.platformName, platformVersion: BlueConicClientModule.platformVersion)
+        BlueConic.setPlatformInformation(platformName: BlueConicClientModule.platformName, platformVersion: BlueConicClientModule.platformVersion)
         return instance
     }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueconic/blueconic-react-native",
-  "version": "3.1.0",
+  "version": "3.2.1",
   "description": "The BlueConicClient Framework provides the basis for communicating with BlueConic.",
   "main": "index.js",
   "files": [
@@ -26,8 +26,8 @@
   "author": "BlueConic (info@blueconic.com)",
   "license": "SEE LICENSE IN LICENSE",
   "nativeDependencies": {
-    "android": "5.1.0",
-    "ios": "3.2.0"
+    "android": "5.2.2",
+    "ios": "3.3.0"
   },
   "peerDependencies": {
     "react-native": "<1.0.0"