@pensasystems/pensa-react-native 0.1.0-beta-4 → 0.1.0-beta-5

package/PensaSdkReactNative.podspec

@@ -21,5 +21,5 @@ Pod::Spec.new do |s|
     s.dependency "React-Core"
   end
 
-  s.dependency "PensaSdk", "~> 1.0.5"
+  s.dependency "PensaSdk", "~> 1.0.6"
 end

package/ios/PensaSdkReactNative.swift

@@ -143,8 +143,8 @@ class PensaSdkReactNative: NSObject {
             // metadata
             if let metadata = status.metadata {
               dict["metadata"] = [
-                "guid": metadata.guid ?? NSNull(),
-                "serverUploadStarted": metadata.serverUploadStarted ?? NSNull()
+                "guid": (metadata.guid as Any?) ?? NSNull(),
+                "serverUploadStarted": (metadata.serverUploadStarted as Any?) ?? NSNull()
               ]
             } else {
               dict["metadata"] = NSNull()
@@ -161,59 +161,69 @@ class PensaSdkReactNative: NSObject {
       )
     }
 
-    @objc(fetchOnDemandReports:projectId:withResolver:withRejecter:)
-    func fetchOnDemandReports(
-      scanId: NSNumber,
-      projectId: NSNumber?,
-      resolve: @escaping RCTPromiseResolveBlock,
-      reject: @escaping RCTPromiseRejectBlock
-    ) {
-
-      Pensa.shared.fetchOnDemandReports(
-        scanId: scanId.intValue,
-        projectId: projectId?.intValue,
-        onSuccess: { report in
-          var result: [String: Any] = [:]
-
-          // facingsSeen bucket
-          if let bucket = report.facingsSeen {
-            let products = bucket.productList.map { product -> [String: Any] in
+  @objc(fetchOnDemandReports:projectId:withResolver:withRejecter:)
+  func fetchOnDemandReports(
+    scanId: NSNumber,
+    projectId: NSNumber?,
+    resolve: @escaping RCTPromiseResolveBlock,
+    reject: @escaping RCTPromiseRejectBlock
+  ) {
+
+    Pensa.shared.fetchOnDemandReports(
+      scanId: scanId.intValue,
+      projectId: projectId?.intValue,
+      onSuccess: { report in
+
+        func rn(_ value: Any?) -> Any { value ?? NSNull() }
+
+        var result: [String: Any] = [
+          "shelfId": rn(report.shelfId),
+          "shelfName": rn(report.shelfName)
+        ]
+
+        if let item = report.facingsSeen {
+          var itemDict: [String: Any] = [
+            "projectId": rn(item.projectId),
+            "projectName": rn(item.projectName),
+            "projectReportId": rn(item.projectReportId),
+            "projectReportName": rn(item.projectReportName)
+          ]
+
+          if let bucket = item.report {
+            let products: [[String: Any]] = bucket.productList.map { product in
               return [
-                "brand": product.brand ?? NSNull(),
-                "brandId": product.brandId as Any,
-                "category": product.category ?? NSNull(),
-                "categoryId": product.categoryId as Any,
-                "facings": product.facings as Any,
-                "manufacturer": product.manufacturer ?? NSNull(),
-                "manufacturerId": product.manufacturerId as Any,
-                "product": product.product ?? NSNull(),
-                "productId": product.productId as Any,
-                "upc": product.upc ?? NSNull()
+                "brand": rn(product.brand),
+                "brandId": rn(product.brandId),
+                "category": rn(product.category),
+                "categoryId": rn(product.categoryId),
+                "facings": rn(product.facings),
+                "manufacturer": rn(product.manufacturer),
+                "manufacturerId": rn(product.manufacturerId),
+                "product": rn(product.product),
+                "productId": rn(product.productId),
+                "upc": rn(product.upc)
               ]
             }
 
-            result["facingsSeen"] = [
+            itemDict["report"] = [
               "productList": products
             ]
           } else {
-            result["facingsSeen"] = NSNull()
+            itemDict["report"] = NSNull()
           }
 
-          // Scalar fields
-          result["projectId"] = report.projectId as Any
-          result["projectName"] = report.projectName ?? NSNull()
-          result["projectReportId"] = report.projectReportId as Any
-          result["projectReportName"] = report.projectReportName ?? NSNull()
-          result["shelfId"] = report.shelfId as Any
-          result["shelfName"] = report.shelfName ?? NSNull()
-
-          resolve(result)
-        },
-        onError: { error in
-          reject("FETCH_ON_DEMAND_REPORTS_FAILED", error.localizedDescription, error)
+          result["facingsSeen"] = itemDict
+        } else {
+          result["facingsSeen"] = NSNull()
         }
-      )
-    }
+
+        resolve(result)
+      },
+      onError: { error in
+        reject("FETCH_ON_DEMAND_REPORTS_FAILED", error.localizedDescription, error)
+      }
+    )
+  }
 
     @objc(fetchProductImageBase64:withResolver:withRejecter:)
     func fetchProductImageBase64(productId: NSNumber,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pensasystems/pensa-react-native",
-  "version": "0.1.0-beta-4",
+  "version": "0.1.0-beta-5",
   "description": "The Pensa Mobile App SDK is a developer toolkit designed to simplify adding Pensa’s capabilities to your mobile applications. It provides pre-built libraries, tools, and APIs to accelerate development and integration, offering streamlined SDK integration, easy initialization, and comprehensive functionality. With the Pensa SDK, you can enhance your app’s features or seamlessly integrate with other services for a cohesive user experience.",
   "source": "./src/index.tsx",
   "main": "./lib/module/index.js",