simplify and use proxy addEvent call

Author: Ulrico972

android/src/main/java/com/urbanairship/reactnative/AirshipModule.kt

@@ -454,10 +454,17 @@ class AirshipModule internal constructor(val context: ReactApplicationContext) :
         }
     }
 
+    @ReactMethod
+    override fun addCustomEvent(event: ReadableMap?, promise: Promise) {
+        promise.resolveResult {
+            proxy.analytics.addEvent(Utils.convertMap(event).toJsonValue())
+        }
+    }
+
     @ReactMethod
     override fun actionRun(action: ReadableMap, promise: Promise) {
         promise.resolveDeferred<ActionValue> { callback ->
-            proxy.actions.runAction(requireNotNull(action.getString("_name")), Utils.convertDynamic(action.getDynamic("_value")))
+            proxy.actions.runAction(requireNotNull(action.getString("name")), Utils.convertDynamic(action.getDynamic("value")))
                     .addResultCallback { actionResult ->
                         if (actionResult != null && actionResult.status == ActionResult.STATUS_COMPLETED) {
                             callback(actionResult.value, null)

android/src/oldarch/java/com/urbanairship/reactnative/AirshipSpec.kt

@@ -237,6 +237,13 @@ abstract class AirshipSpec internal constructor(context: ReactApplicationContext
         promise: Promise
     )
 
+    @ReactMethod
+    @com.facebook.proguard.annotations.DoNotStrip
+    abstract fun addCustomEvent(
+        event: ReadableMap?,
+        promise: Promise
+    )
+
     @ReactMethod
     @com.facebook.proguard.annotations.DoNotStrip
     abstract fun actionRun(

ios/AirshipReactNative.swift

@@ -330,8 +330,8 @@ public extension AirshipReactNative {
 public extension AirshipReactNative {
     func actionsRun(action: [String: Any]) async throws-> Any? {
         return try await AirshipProxy.shared.action.runAction(
-            action["_name"] as! String,
-            value: action["_value"] is NSNull ? nil : try AirshipJSON.wrap(action["_value"])
+            action["name"] as! String,
+            value: action["value"] is NSNull ? nil : try AirshipJSON.wrap(action["value"])
         )
     }
 }
@@ -350,6 +350,10 @@ public extension AirshipReactNative {
             key: key
         )
     }
+
+    func addCustomEvent(_ json: Any) throws {
+        try AirshipProxy.shared.analytics.addEvent(json)
+    }
 }
 
 // Contact

ios/RTNAirship.mm

@@ -374,6 +374,17 @@ + (BOOL)requiresMainQueueSetup {
     [self handleResult:nil error:error resolve:resolve reject:reject];
 }
 
+RCT_REMAP_METHOD(addCustomEvent,
+                 addCustomEvent:(NSDictionary *)event
+                 resolve:(RCTPromiseResolveBlock)resolve
+                 reject:(RCTPromiseRejectBlock)reject) {
+    NSError *error;
+    [AirshipReactNative.shared addCustomEvent:event
+                                        error:&error];
+
+    [self handleResult:nil error:error resolve:resolve reject:reject];
+}
+
 RCT_REMAP_METHOD(contactEditAttributes,
                  contactEditAttributes:(NSArray *)operations
                  resolve:(RCTPromiseResolveBlock)resolve

src/Action.ts

@@ -1,5 +1,4 @@
 import { JsonValue } from './types';
-import { Action } from './Action';
 
 /**
  * Airship actions.
@@ -10,13 +9,15 @@ export class AirshipActions {
   /**
    * Runs an Airship action.
    *
-   * @param action The Airship Action.
+   * @param actionName The name of the action.
+   * @param actionValue The action's value.
    * @return A promise that returns the action result if the action
    * successfully runs, or the Error if the action was unable to be run.
    */
   public run(
-    action: Action
+    actionName: String,
+    actionValue: JsonValue
   ): Promise<JsonValue | null | undefined> {
-    return this.module.actionRun(action);
+    return this.module.actionRun({name: actionName, value: actionValue});
   }
 }

src/AirshipActions.ts

@@ -1,4 +1,3 @@
-import { Action } from "./Action";
 import { CustomEvent } from "./CustomEvent";
 
 /**
@@ -33,15 +32,7 @@ export class AirshipAnalytics {
    * @return A promise that returns null if resolved, or an Error if the
    * custom event is rejected.
    */
-  public addCustomEvent(event: CustomEvent): Promise<null | Error> {
-    let action = new Action("add_custom_event_action", event.toJsonValue())
-
-    return new Promise((resolve, reject) => {
-      this.module.actionRun(action).then(() => {
-        resolve(null)
-      }, (error: Error) => {
-        reject(error)
-      })
-    })
+  public addCustomEvent(event: CustomEvent): Promise<void> {
+    return this.module.addCustomEvent(event.toJsonValue());
   }
 }

src/AirshipAnalytics.ts

@@ -12,6 +12,8 @@ export class CustomEvent {
   _value?: number;
   _properties: JsonObject;
   _transactionId?: string;
+  _interactionId?: string;
+  _interactionType?: string;
 
   /**
    * Custom event constructor.
@@ -39,6 +41,34 @@ export class CustomEvent {
     this._transactionId = value;
   }
 
+  /**
+   * Gets the event's interaction ID.
+   */
+  get interactionId(): string | undefined {
+    return this._interactionId;
+  }
+
+  /**
+   * Sets the event's interaction ID.
+   */
+  set interactionId(value: string | undefined) {
+    this._interactionId = value;
+  }
+
+  /**
+   * Gets the event's interaction Type.
+   */
+  get interactionType(): string | undefined {
+    return this._interactionType;
+  }
+
+  /**
+   * Sets the event's interaction Type.
+   */
+  set interactionType(value: string | undefined) {
+    this._interactionType = value;
+  }
+
   /**
    * Adds a property to the custom event.
    *
@@ -56,13 +86,19 @@ export class CustomEvent {
    */
   toJsonValue(): JsonValue {
     let jsonObject: JsonObject = {};
-    jsonObject.event_name = this._name;
+    jsonObject.eventName = this._name;
     if (this._value) {
-      jsonObject.event_value = this._value;
+      jsonObject.eventValue = this._value;
     }
     jsonObject.properties = this._properties;
     if (this._transactionId) {
-      jsonObject.transaction_id = this._transactionId;
+      jsonObject.transactionId = this._transactionId;
+    }
+    if (this._interactionId) {
+      jsonObject.interactionId = this._interactionId;
+    }
+    if (this._interactionType) {
+      jsonObject.interactionType = this._interactionType;
     }
     return jsonObject;
   }

src/CustomEvent.ts

@@ -66,6 +66,7 @@ export interface Spec extends TurboModule {
   // Analytics
   analyticsTrackScreen(screen?: string): Promise<void>;
   analyticsAssociateIdentifier(key: string, identifier?: string): Promise<void>;
+  addCustomEvent(event: Object): Promise<void>;
 
   // Action
   actionRun(action: Object): Promise<Object | Error>;

src/NativeRTNAirship.ts

@@ -19,7 +19,6 @@ export { SubscriptionListEditor } from './SubscriptionListEditor';
 export { TagGroupEditor } from './TagGroupEditor';
 export { ScopedSubscriptionListEditor } from './ScopedSubscriptionListEditor';
 export { AttributeEditor } from './AttributeEditor';
-export { Action } from './Action';
 
 export * from './types';
 export * from './MessageView';