@applicaster/zapp-react-dom-app 14.0.0-rc.48 → 14.0.0-rc.49

package/App/Loader/loadSessionStorageData.js

@@ -1,9 +1,7 @@
-import * as R from "ramda";
 import { NativeModules } from "react-native";
 import uuidv4 from "uuid/v4";
 
 import { isEmptyOrNil } from "@applicaster/zapp-react-native-utils/cellUtils";
-import { mapKeys } from "@applicaster/zapp-react-native-utils/objectUtils";
 import { appStore } from "@applicaster/zapp-react-native-redux/AppStore";
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
 import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
@@ -55,14 +53,17 @@ export const loadPluginDataIntoSession = async (plugins = null) => {
 async function gatherData(uuid) {
   const deviceData = await getDeviceData();
 
+  // Prevent the device sdkVersion from overriding the build time value
+  delete deviceData.sdkVersion;
+
   const { languageLocale, countryLocale } =
     NativeModules?.QuickBrickCommunicationModule || {};
 
   const sessionStorageData = {
     // Build time values
     ...NativeModules?.QuickBrickCommunicationModule,
-    // Device data retrieved from native device apis, sdkVersion of the device was overriding the build time value
-    ...R.omit(["sdkVersion"], deviceData),
+    // Device data retrieved from native device apis
+    ...deviceData,
     userAgent: deviceData.userAgent || getUserAgent(),
     uuid: uuid || uuidv4(), // Created on first session, persisted in local thereafter
     sessionId: uuidv4(), // Created on every session
@@ -80,21 +81,23 @@ async function gatherData(uuid) {
  * @param {Object} desiredKeys - The map of original key names to desired key names.
  */
 function storeData(data, desiredKeys) {
-  // Pick only the keys we want and need, map them to the correct name, and reject any unusuable data
-  const filteredData = R.compose(
-    R.reject(isEmptyOrNil),
-    R.reject(R.either(R.is(Object), R.is(Function))),
-    mapKeys(renameKeys),
-    R.pick(Object.keys(desiredKeys))
-  )(data);
-
-  R.forEachObjIndexed((value, key) => {
-    if (key === "uuid") {
-      localStorage.setItem(key, value);
+  const desiredKeysList = Object.keys(desiredKeys);
+
+  Object.entries(data).forEach(([key, value]) => {
+    if (!desiredKeysList.includes(key)) return;
+
+    if (isEmptyOrNil(value)) return;
+
+    if (typeof value === "object" || typeof value === "function") return;
+
+    const renamedKey = renameKeys(key);
+
+    if (renamedKey === "uuid") {
+      localStorage.setItem(renamedKey, value);
     }
 
-    sessionStorage.setItem(key, value);
-  }, filteredData);
+    sessionStorage.setItem(renamedKey, value);
+  });
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/zapp-react-dom-app",
-  "version": "14.0.0-rc.48",
+  "version": "14.0.0-rc.49",
   "description": "Zapp App Component for Applicaster's Quick Brick React Native App",
   "main": "index.js",
   "scripts": {
@@ -22,11 +22,11 @@
   },
   "homepage": "https://github.com/applicaster/zapp-react-dom-app#readme",
   "dependencies": {
-    "@applicaster/zapp-react-dom-ui-components": "14.0.0-rc.48",
-    "@applicaster/zapp-react-native-bridge": "14.0.0-rc.48",
-    "@applicaster/zapp-react-native-redux": "14.0.0-rc.48",
-    "@applicaster/zapp-react-native-ui-components": "14.0.0-rc.48",
-    "@applicaster/zapp-react-native-utils": "14.0.0-rc.48",
+    "@applicaster/zapp-react-dom-ui-components": "14.0.0-rc.49",
+    "@applicaster/zapp-react-native-bridge": "14.0.0-rc.49",
+    "@applicaster/zapp-react-native-redux": "14.0.0-rc.49",
+    "@applicaster/zapp-react-native-ui-components": "14.0.0-rc.49",
+    "@applicaster/zapp-react-native-utils": "14.0.0-rc.49",
     "abortcontroller-polyfill": "^1.7.5",
     "typeface-montserrat": "^0.0.54",
     "video.js": "7.14.3",