@dashx/react-native 0.1.24 → 0.1.25

package/index.js

@@ -1,12 +1,19 @@
 import { NativeEventEmitter, NativeModules } from 'react-native'
+import { parseFilterObject, toContentSingleton } from './utils'
+import {
+  prepareExternalAsset,
+  queryExternalAsset,
+  uploadExternalAsset,
+} from './utils/RestAPIClient'
 
 import ContentOptionsBuilder from './ContentOptionsBuilder'
-import { parseFilterObject, toContentSingleton } from './utils'
 
 const { DashX } = NativeModules
 const dashXEventEmitter = new NativeEventEmitter(DashX)
 
-const { identify, track, fetchContent, searchContent } = DashX
+//TODO Get connection config from Android layer as well
+const { identify, track, fetchContent, searchContent, getConnectionConfig } =
+  DashX
 
 // Handle overloads at JS, because Native modules doesn't allow that
 // https://github.com/facebook/react-native/issues/19116
@@ -20,10 +27,14 @@ DashX.identify = (options) => {
 
 DashX.track = (event, data) => track(event, data || null)
 
+DashX.getConnectionConfig = () => {
+  return getConnectionConfig()
+}
+
 DashX.searchContent = (contentType, options) => {
   if (!options) {
-    return new ContentOptionsBuilder(
-      (wrappedOptions) => searchContent(contentType, wrappedOptions)
+    return new ContentOptionsBuilder((wrappedOptions) =>
+      searchContent(contentType, wrappedOptions)
     )
   }
 
@@ -42,6 +53,36 @@ DashX.fetchContent = (contentType, options) => {
   return fetchContent(contentType, options)
 }
 
+DashX.uploadExternalAsset = async (file, externalColumnId) => {
+  const connectionConfig = await getConnectionConfig()
+
+  return new Promise((resolve, reject) => {
+    uploadExternalAsset(
+      file,
+      externalColumnId,
+      connectionConfig,
+      resolve,
+      reject
+    )
+  })
+}
+
+DashX.prepareExternalAsset = async (externalColumnId) => {
+  const connectionConfig = await getConnectionConfig()
+
+  return new Promise((resolve, reject) => {
+    prepareExternalAsset(externalColumnId, connectionConfig, resolve, reject)
+  })
+}
+
+DashX.externalAsset = async (assetId) => {
+  const connectionConfig = await getConnectionConfig()
+
+  return new Promise((resolve, reject) => {
+    queryExternalAsset(assetId, connectionConfig, resolve, reject)
+  })
+}
+
 DashX.onMessageReceived = (callback) =>
   dashXEventEmitter.addListener('messageReceived', callback)
 

package/ios/DashX.m

@@ -4,6 +4,7 @@
 @interface RCT_EXTERN_MODULE(DashX, RCTEventEmitter)
 RCT_EXTERN_METHOD(setLogLevel:(NSInteger *)to)
 RCT_EXTERN_METHOD(setup:(NSDictionary *)options)
+RCT_EXTERN_METHOD(getConnectionConfig:(RCTPromiseResolveBlock)resolve rejecter:(RCTPromiseRejectBlock)reject)
 RCT_EXTERN_METHOD(identify:(NSString *)uid options:(NSDictionary *)options)
 RCT_EXTERN_METHOD(setIdentityToken:(NSString *)identityToken)
 RCT_EXTERN_METHOD(reset)

package/ios/DashX.swift

@@ -56,6 +56,16 @@ class DashX: RCTEventEmitter {
         }
     }
 
+    @objc(getConnectionConfig:rejecter:)
+    func getConnectionConfig(_ resolve: @escaping RCTPromiseResolveBlock, rejecter reject: @escaping RCTPromiseRejectBlock) {
+      return resolve([
+        "baseUri": Network.shared.getBaseUri(),
+        "publicKey": ConfigInterceptor.shared.publicKey,
+        "targetEnvironment": ConfigInterceptor.shared.targetEnvironment,
+        "identityToken": ConfigInterceptor.shared.identityToken,
+      ])
+    }
+
     @objc(identify:options:)
     func identify(_ uid: String?, _ options: NSDictionary?) {
         try? dashXClient.identify(uid, withOptions: options)

package/ios/Network.swift

@@ -9,6 +9,10 @@ class Network {
       self.baseUri = to
     }
 
+    func getBaseUri() -> String {
+      return self.baseUri
+    }
+
     private(set) lazy var apollo: ApolloClient = {
         let client = URLSessionClient()
         let cache = InMemoryNormalizedCache()
@@ -23,7 +27,7 @@ class Network {
     }()
 }
 
-class NetworkInterceptorProvider: LegacyInterceptorProvider {
+class NetworkInterceptorProvider: DefaultInterceptorProvider {
     override func interceptors<Operation: GraphQLOperation>(for operation: Operation) -> [ApolloInterceptor] {
         var interceptors = super.interceptors(for: operation)
         interceptors.insert(ConfigInterceptor.shared, at: 0)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@dashx/react-native",
   "title": "DashX React Native",
-  "version": "0.1.24",
+  "version": "0.1.25",
   "description": "DashX SDK for React Native",
   "main": "index.js",
   "files": [
@@ -35,7 +35,14 @@
     "react-native": ">=0.59.0-rc.0 <1.0.x"
   },
   "devDependencies": {
+    "eslint": "^8.21.0",
+    "eslint-plugin-react": "^7.30.1",
+    "get-file-object-from-local-path": "^1.0.2",
     "react": "^16.11.0",
     "react-native": "^0.62.0-rc.2"
+  },
+  "dependencies": {
+    "axios": "^0.27.2",
+    "rn-fetch-blob": "^0.12.0"
   }
 }