Merge pull request #10 from logicwind/dev

Fixed the custom dimension not track issue

Author: bhavesh-lw

README.md

@@ -286,14 +286,14 @@ trackMediaEvent function use to monitor user interactions with media content, su
 | mediaHeight    | The resolution height of the media in pixels. Only recommended being set for videos.                            |
 | mediaFullScreen| Should be 0 or 1 and defines whether the media is currently viewed in full screen. Only recommended being set for videos.                            |
 | mediaSE        | An optional comma separated list of which positions within a media a user has played. For example if the user has viewed position 5s, 10s, 15s and 35s, then you would need to send 5,10,15,35. We recommend to round to the next 5 seconds and not send a value for each second. Internally, Matomo may round to the next 15 or 30 seconds. For performance optimisation we recommend not sending the same position twice. Meaning if you have sent ma_se=10 there is no need to send later ma_se=10,20 but instead only ma_se=20.                             |
-| dimensions| Dimension contains a key and a value, and where the key is a custom dimension key created on the Matomo dashboard and the value should be a string, you'll need to ensure that the dimensions array is processed correctly. [create custom dimension](https://matomo.org/faq/reporting-tools/create-track-and-manage-custom-dimensions/)    
+| dimensions| Dimension contains a key and a value, and where the key is a custom dimension id created on the Matomo dashboard and the value should be a string, you'll need to ensure that the dimensions array is processed correctly. [create custom dimension](https://matomo.org/faq/reporting-tools/create-track-and-manage-custom-dimensions/)    
 
 
 #### Examples
 
 ```js
 
-trackMediaEvent({siteId:"siteid",mediaId:"unique id",mediaTitle:"video media play track",playerName:"test 08",mediaType:MediaType.VIDEO,mediaResource:"http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",mediaStatus:"100",mediaLength:"100",mediaFullScreen:"1",mediaHeight:"720",mediaWidth:"1080",mediaProgress:"100", dimensions:[{key:"dimension1",value: "cf7fad2e-fae4-4c49-9924-ad9a2a7c50de"}]});
+trackMediaEvent({siteId:"siteid",mediaId:"unique id",mediaTitle:"video media play track",playerName:"test 08",mediaType:MediaType.VIDEO,mediaResource:"http://commondatastorage.googleapis.com/gtv-videos-bucket/sample/BigBuckBunny.mp4",mediaStatus:"100",mediaLength:"100",mediaFullScreen:"1",mediaHeight:"720",mediaWidth:"1080",mediaProgress:"100", dimensions:[{key:"1",value: "cf7fad2e-fae4-4c49-9924-ad9a2a7c50de"}]});
 
 ```
 

android/src/main/java/com/logicwind/reactnativematomotracker/ReactNativeMatomoTrackerModule.kt

@@ -303,16 +303,14 @@ class ReactNativeMatomoTrackerModule(reactContext: ReactApplicationContext) :
           val dimension = dimensions.getMap(i)
           val key = dimension?.getString("key")
           val value = dimension?.getString("value")
-
           if (key != null && value != null) {
-            try {
-              val jsonObject = JSONObject(value)
-              val jsonValueString = jsonObject.toString()
-              TrackHelper.track().screen("/media").dimension(i+1,value).with(tracker)
-              trackDispatch()
-            } catch (e: Exception) {
-              TrackHelper.track().screen("/media").dimension(i+1,value).with(tracker)
-              trackDispatch()
+
+            val id = key.toIntOrNull()
+            if (id != null) {
+              TrackHelper.track().screen("/media").dimension(id,value).with(tracker)
+              trackDispatch();
+            } else {
+              println("Key could not be converted to an Int")
             }
           }
         }

ios/ReactNativeMatomoTracker.swift

@@ -177,28 +177,20 @@ class ReactNativeMatomoTracker: NSObject {
     ) {
         if(!siteId.isEmpty && matomoTracker != nil)
         {
-            
             if(mediaStatus=="0"){
-                
                 matomoTracker?.track(eventWithCategory:mediaType, action:"play",name: mediaTitle)
-                matomoTracker?.dispatch()
             }
-
             if(mediaStatus==mediaLength){
                 matomoTracker?.track(eventWithCategory:mediaType, action:"stop",name: mediaTitle)
-                matomoTracker?.dispatch()
             }
-            
-
+    
             var uid =  ""
-            
             if var userId = matomoTracker?.userId {
                 uid = userId
             } else {
                 uid = ""
             }
 
-           
             let baseUrl = baseURL
             var query = "idsite=\(encodeParameter(value: siteId))" +
                         "&rec=1" +
@@ -213,22 +205,19 @@ class ReactNativeMatomoTracker: NSObject {
                         "&uid=\(encodeParameter(value: uid))"
 
             if(!dimensions.isEmpty){
-            
+              
               for dimension in dimensions {
                 if let key = dimension["key"] as? String, let value = dimension["value"] as? String {
-                    // Attempt to parse the JSON value
-                    if let data = value.data(using: .utf8),
-                       let jsonObject = try? JSONSerialization.jsonObject(with: data, options: []) as? [String: Any] {
-                        // Convert jsonObject to a string or handle as needed
-                        let jsonValueString = jsonObject.map { "\($0.key)=\($0.value)" }.joined(separator: ",")
-                        query += "&\(key)=\(encodeParameter(value: jsonValueString))"
+                    if let id = Int(key) {
+                        matomoTracker?.setDimension(value, forIndex: id)
+                        matomoTracker?.dispatch()
                     } else {
-                        query += "&\(key)=\(encodeParameter(value: value))"
+                        print("Key could not be converted to an Int")
                     }
                 }
               }
-                
             }
+        
 
 //            if(!customVariable.isEmpty){
 //             
@@ -283,6 +272,7 @@ class ReactNativeMatomoTracker: NSObject {
                 }
                 task.resume()
             }
+            matomoTracker?.dispatch()
         }
     }
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@logicwind/react-native-matomo-tracker",
-  "version": "0.3.5",
+  "version": "0.3.6",
   "description": "React-native plugin for matomo analytics",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",