react-native-moengage-inbox 5.1.1 → 6.0.0

package/ReactNativeMoEngageInbox.podspec

@@ -10,14 +10,14 @@ Pod::Spec.new do |s|
   s.license      = package['license']
   s.authors      = package["author"]
 
-  s.platforms    = { :ios => "11.0" }
+  s.platforms    = { :ios => "13.0" }
   s.source       = { :git => "https://github.com/moengage/React-Native.git", :tag => "#{s.version}" }
 
   s.source_files = "ios/**/*.{h,m,mm,swift}"
   s.public_header_files = 'ios/**/*.h'
 
   s.dependency "React-Core"
-  s.dependency "MoEngagePluginInbox",'3.3.2'
+  s.dependency "MoEngagePluginInbox",'4.2.1'
   s.dependency 'ReactNativeMoEngage'
   s.module_map = false
 

package/android/build.gradle

@@ -15,9 +15,9 @@ buildscript {
 
 ext {
   //dependency version
-  moengageCoreVersion = "13.06.00"
-  moengageInboxCoreVersion = "3.3.0"
-  pluginBaseInboxVersion = "4.2.0"
+  moengageCoreVersion = "14.03.00"
+  moengageInboxCoreVersion = "4.1.0"
+  pluginBaseInboxVersion = "5.0.0"
 }
 
 apply plugin: 'com.android.library'
@@ -25,10 +25,10 @@ apply plugin: 'kotlin-android'
 apply plugin: 'com.facebook.react'
 
 android {
-  compileSdk 34
+  compileSdk 35
   namespace "com.moengage.react.inbox"
   defaultConfig {
-    minSdk 21
+    minSdk 23
     versionCode 1
     versionName "1.0"
 
@@ -83,4 +83,4 @@ dependencies {
 
 def isNewArchitectureEnabled() {
   return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
-}
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-moengage-inbox",
-  "version": "5.1.1",
+  "version": "6.0.0",
   "description": "Inbox Module for the MoEngage Platform",
   "main": "src/index.ts",
   "files": [
@@ -18,7 +18,7 @@
     "!**/__mocks__"
   ],
   "scripts": {
-    "test": "echo \"Test cases not available\" && exit 0"
+    "test": "jest"
   },
   "keywords": [
     "react-native",
@@ -39,7 +39,11 @@
   },
   "license": "SEE LICENSE IN LICENSE.txt",
   "devDependencies": {
-    "react-native": "0.73.0"
+    "@types/jest": "^29.5.0",
+    "babel-jest": "^29.7.0",
+    "react-native": "0.73.0",
+    "ts-jest": "^29.1.0",
+    "typescript": "^4.3.0"
   },
   "codegenConfig": {
     "name": "NativeMoEngageInboxSpec",

package/src/model/MoEInboxMessage.ts

@@ -13,8 +13,11 @@ export default class MoEInboxMessage {
   receivedTime: string;
   expiry: string;
   payload: Map<String, Object>;
+  groupKey: string | null;
+  notificationId: string | null;
+  sentTime: string | null;
 
-  constructor(id: number | undefined, campaignId: string, textContent: MoETextContent, isClicked: boolean, media: MoEMedia | undefined, action: Array<MoEAction> | undefined, tag: string | undefined, receivedTime: string, expiry: string, payload: Map<String, Object>) {
+  constructor(id: number | undefined, campaignId: string, textContent: MoETextContent, isClicked: boolean, media: MoEMedia | undefined, action: Array<MoEAction> | undefined, tag: string | undefined, receivedTime: string, expiry: string, payload: Map<String, Object>, groupKey: string | null, notificationId: string | null, sentTime: string | null) {
     this.id = id;
     this.campaignId = campaignId;
     this.text = textContent;
@@ -25,6 +28,8 @@ export default class MoEInboxMessage {
     this.receivedTime = receivedTime;
     this.expiry = expiry;
     this.payload = payload
-
+    this.groupKey = groupKey;
+    this.notificationId = notificationId;
+    this.sentTime = sentTime;
   }
 }

package/src/model/MoEMedia.ts

@@ -1,10 +1,14 @@
 import { MoEMediaType } from "./MoEMediaType";
+import { MoEAccessibilityData } from "react-native-moengage";
 
 export default class MoEMedia {
   mediaType: MoEMediaType;
   url: string;
-  constructor(mediaType: MoEMediaType, url: string) {
+  accessibilityData: MoEAccessibilityData | null;
+  
+  constructor(mediaType: MoEMediaType, url: string, accessibilityData: MoEAccessibilityData | null) {
     this.mediaType = mediaType;
     this.url = url;
+    this.accessibilityData = accessibilityData;
   }
 }

package/src/model/MoETextContent.ts

@@ -2,6 +2,8 @@ export default class MoETextContent {
   title: string;
   message: string;
   summary?: string | undefined;
+  // Only for iOS
+  // subtitle is only for iOS
   subtitle?: string | undefined;
   constructor(title: string, message: string, summary: string | undefined, subtitle: string | undefined) {
     this.title = title;

package/src/utils/MoEInboxConstants.ts

@@ -26,4 +26,7 @@ export const PAYLOAD = 'payload'
 
 export const MOE_DATA = 'data'
 export const ACCOUNT_META = "accountMeta"
+export const GROUP_KEY = "groupKey"
+export const NOTIFICATION_ID = "notificationId"
+export const SENT_TIME = "sentTime"
 

package/src/utils/MoEInboxParser.ts

@@ -7,7 +7,9 @@ import MoEAction from "../model/MoEAction";
 import * as InboxConstants from "../utils/MoEInboxConstants"
 import { isValidObject, isValidString, isValidNumber } from "../utils/MoEInboxHelper";
 import { MoEPlatform } from "../model/MoEPlatform";
-import { MOE_DATA } from "../utils/MoEInboxConstants"
+import { MOE_DATA } from "../utils/MoEInboxConstants";
+import { KEY_ACCESSIBILITY, MoEAccessibilityData } from "react-native-moengage";
+
 const PLATFORM = 'platform'
 const UNCLICKED_COUNT = 'unClickedCount'
 
@@ -15,8 +17,8 @@ export function inboxDataFromJson(payload: string) {
   const inboxJSON = JSON.parse(payload);
   const inboxData = inboxJSON[InboxConstants.MOE_DATA]
   var platform;
-  var messageList:MoEInboxMessage[] = [];
-  
+  var messageList: MoEInboxMessage[] = [];
+
   if (isValidObject(inboxData)) {
 
     platform = inboxData[PLATFORM];
@@ -25,7 +27,7 @@ export function inboxDataFromJson(payload: string) {
     for (var message of messages) {
       var inboxMessage = inboxMessageFromJson(message);
       if (inboxMessage != null)
-      messageList.push(inboxMessage);
+        messageList.push(inboxMessage);
     }
   }
   if (platform != undefined)
@@ -33,7 +35,7 @@ export function inboxDataFromJson(payload: string) {
   return undefined;
 }
 
-function inboxMessageFromJson(message: { [k: string]: any }) {
+export function inboxMessageFromJson(message: { [k: string]: any }) {
   if (message != undefined) {
     var id;
     var campaignId;
@@ -42,9 +44,12 @@ function inboxMessageFromJson(message: { [k: string]: any }) {
     var expiry;
     var tag;
     var textContent;
-    var actionList:Array<MoEAction>=[];
+    var actionList: Array<MoEAction> = [];
     var media;
     var payload;
+    var groupKey: string | null = null;
+    var notificationId: string | null = null;
+    var sentTime: string | null = null;
 
     campaignId = message[InboxConstants.CAMPAIGN_ID];
     isClicked = message[InboxConstants.IS_CLICKED];
@@ -61,9 +66,9 @@ function inboxMessageFromJson(message: { [k: string]: any }) {
 
     textContent = textContentFromJson(message[InboxConstants.TEXT]);
     for (var action of actions) {
-      var moEAction=actionModelFromJson(action)
-      moEAction?
-     actionList.push(moEAction):null;
+      var moEAction = actionModelFromJson(action)
+      moEAction ?
+        actionList.push(moEAction) : null;
     }
     if (isValidObject(message[InboxConstants.MEDIA])) {
       media = mediaModelFromJson(message[InboxConstants.MEDIA]);
@@ -72,19 +77,30 @@ function inboxMessageFromJson(message: { [k: string]: any }) {
     if (isValidObject(message[InboxConstants.PAYLOAD])) {
       payload = message[InboxConstants.PAYLOAD];
     }
+    if (isValidString(message[InboxConstants.GROUP_KEY])) {
+      groupKey = message[InboxConstants.GROUP_KEY];
+    }
+    if (isValidString(message[InboxConstants.NOTIFICATION_ID])) {
+      notificationId = message[InboxConstants.NOTIFICATION_ID];
+    }
+    if (isValidString(message[InboxConstants.SENT_TIME])) {
+      sentTime = message[InboxConstants.SENT_TIME];
+    }
     if (campaignId != undefined && textContent != undefined && isClicked != undefined && receivedTime != undefined && expiry != undefined && payload != undefined)
-      return new MoEInboxMessage(id, campaignId, textContent, isClicked, media, actionList, tag, receivedTime, expiry, payload)
+      return new MoEInboxMessage(id, campaignId, textContent, isClicked, media, actionList, tag, receivedTime, expiry, payload, groupKey, notificationId, sentTime);
     else
       return undefined;
 
   }
   else return undefined;
-  
+
 }
 
 function mediaModelFromJson(mediaObject: { [k: string]: any }) {
   var mediaType;
-  var url
+  var url;
+  var accessibilityData;
+
   if (isValidString(mediaObject[InboxConstants.TYPE])) {
     mediaType = mediaObject[InboxConstants.TYPE];
   }
@@ -92,12 +108,16 @@ function mediaModelFromJson(mediaObject: { [k: string]: any }) {
   if (isValidString(mediaObject[InboxConstants.URL])) {
     url = mediaObject[InboxConstants.URL];
   }
+
+  if (isValidObject(mediaObject[KEY_ACCESSIBILITY])) {
+    accessibilityData = MoEAccessibilityData.fromJson(mediaObject[KEY_ACCESSIBILITY]);
+  }
   if (mediaType != undefined && url != undefined)
-    return new MoEMedia(mediaType, url)
+    return new MoEMedia(mediaType, url, accessibilityData ?? null)
   else return undefined;
 }
 
-function actionModelFromJson(actionObject: { [k: string]: any}) {
+function actionModelFromJson(actionObject: { [k: string]: any }) {
   var actionType = actionObject[InboxConstants.ACTION_TYPE];
   var navigationType;
   var value;
@@ -112,7 +132,7 @@ function actionModelFromJson(actionObject: { [k: string]: any}) {
     kvPair = actionObject[InboxConstants.KV_PAIR];
   }
   if (actionType != undefined)
-    return new MoEAction(actionType, navigationType,value,kvPair)
+    return new MoEAction(actionType, navigationType, value, kvPair)
   else return undefined;
 }
 
@@ -158,7 +178,10 @@ export function inboxMessageToJson(message: MoEInboxMessage) {
     isClicked: message.isClicked,
     tag: message.tag,
     receivedTime: message.receivedTime,
-    expiry: message.expiry
+    expiry: message.expiry,
+    sentTime: message.sentTime,
+    groupKey: message.groupKey,
+    notificationId: message.notificationId
   };
   if (isValidObject(message.text)) {
     json[InboxConstants.TEXT] = textContentToJson(message.text);
@@ -197,7 +220,8 @@ function textContentToJson(textContent: MoETextContent) {
 function mediaToJson(media: MoEMedia) {
   var json = {
     type: media.mediaType,
-    url: media.url
+    url: media.url,
+    accessibility: media.accessibilityData ? media.accessibilityData.toJson() : null
   }
   return json
 }
@@ -206,8 +230,8 @@ function actionToJson(action: MoEAction) {
   var json = {
     actionType: action.actionType,
     navigationType: action.navigationType,
-    value:action.value,
-    kvPair:action.kvPair
+    value: action.value,
+    kvPair: action.kvPair
   }
   return json;
 }
@@ -215,10 +239,10 @@ function actionToJson(action: MoEAction) {
 export function fetchEmptyInboxModel() {
   var platform;
 
-  if(Platform.OS=="ios")
-  platform=MoEPlatform.IOS
+  if (Platform.OS == "ios")
+    platform = MoEPlatform.IOS
   else
-  platform=MoEPlatform.Android
+    platform = MoEPlatform.Android
 
   return new MoEInboxData(platform, [])
 }