@applicaster/quick-brick-native-apple 5.20.2 → 5.20.4

package/apple/QuickBrickApple.podspec.json

@@ -1,6 +1,6 @@
 {
   "name": "QuickBrickApple",
-  "version": "5.20.2",
+  "version": "5.20.4",
   "platforms": {
     "ios": "14.0",
     "tvos": "14.0"
@@ -16,7 +16,7 @@
   "authors": "Applicaster LTD.",
   "source": {
     "git": "https://github.com/applicaster/Zapp-Frameworks.git",
-    "tag": "@@applicaster/quick-brick-native-apple/5.20.2"
+    "tag": "@@applicaster/quick-brick-native-apple/5.20.4"
   },
   "requires_arc": true,
   "source_files": "universal/**/*.{m,swift}",
@@ -34,6 +34,7 @@
   "dependencies": {
     "ZappCore": [],
     "React": [],
+    "React-Core": [],
     "React-RCTLinking": [],
     "XrayLogger": []
   },

package/apple/universal/ReactNative/AppLoaderBridge.swift

@@ -8,10 +8,13 @@
 
 import Foundation
 import React
+import XrayLogger
 import ZappCore
 
 @objc(AppLoaderBridge)
 class AppLoaderBridge: NSObject, RCTBridgeModule {
+    lazy var logger = Logger.getLogger(for: "\(Bundle.main.bundleIdentifier!)/native_application/AppLoaderBridge")
+
     static func moduleName() -> String! {
         "AppLoaderBridge"
     }
@@ -26,15 +29,17 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
     }
 
     enum Errors {
-        static let canNotAccessAppData = "Can not access application data"
-        static let parameterDoesNotExist = "The type parameter does not exist/supported"
-        static let noIdentifierBody = "FacadeConnector can't delegate applicationData"
-        static let noCharacters = "Layout id without charaters"
-        static let urlCreationMessage = "There was a problem to create the new layout URLs"
-        static let switchToNewLayoutMessage = "There was a problem to switch to new layout URLs"
-        static let canNotGetPluginsContent = "Can not get the plugins content"
-        static let canNotGetPipesEndpointContent = "Can not get the pipes endpoint content"
-        static let canNotGetCellStylesContent = "Can not get the cell style content"
+        static let parameterDoesNotExist = (message: "The type parameter does not exist/supported", code: "1")
+        static let canNotAccessAppData = (message: "Can not access application data", code: "2")
+        static let switchToNewLayoutMessage = (message: "There was a problem to switch to new layout URLs", code: "3")
+        static let canNotGetRemoteConfigurationContent = (message: "Can not get the remotet configuration content", code: "4")
+        static let canNotGetPluginsContent = (message: "Can not get the plugins content", code: "5")
+        static let canNotGetOriginLayoutContent = (message: "Can not get the origin layout from layout.json  content", code: "6")
+        static let canNotGetLayoutContentFromId = (message: "Can not get the layout from content id", code: "7")
+        static let canNotGetOriginCellStylesContent = (message: "Can not get the origin cellStyles from cell_styles.json", code: "8")
+        static let canNotGetCellStylesContent = (message: "Can not get the layout from content id", code: "9")
+        static let canNotGetStylesContent = (message: "Can not get the stylescontent", code: "10")
+        static let canNotGetPipesEndpointContent = (message: "Can not get the pipes endpoint content", code: "11")
     }
 
     enum ContentType: String {
@@ -47,7 +52,8 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
     }
 
     enum Consts {
-        static let currentLayoutId = "currentLayoutId"
+        static let activeLayoutId = "active_layout_id"
+        static let defaultLayoutId = "default_layout_id"
     }
 
     // MARK: - Bridge Methods
@@ -57,68 +63,82 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
                               resolver: @escaping RCTPromiseResolveBlock,
                               rejecter: @escaping RCTPromiseRejectBlock) {
         guard let applicationData = FacadeConnector.connector?.applicationData else {
-            rejecter("2", Errors.canNotAccessAppData, nil)
+            rejecter(Errors.canNotAccessAppData.code, Errors.canNotAccessAppData.message, nil)
             return
         }
 
         guard let contentType = ContentType(rawValue: type) else {
-            rejecter("1", Errors.parameterDoesNotExist, nil)
+            rejecter(Errors.parameterDoesNotExist.code, Errors.parameterDoesNotExist.message, nil)
             return
         }
 
         switch contentType {
         case .remoteConfigurations:
             guard let remoteConfig = applicationData.remoteConfigurationUrlContent() else {
-                rejecter("2", Errors.canNotAccessAppData, nil)
+                rejecter(Errors.canNotGetRemoteConfigurationContent.code, Errors.canNotGetRemoteConfigurationContent.message, nil)
                 return
             }
+
             let remoteConfigJsonString = remoteConfig.getJsonString()
             resolver(remoteConfigJsonString)
         case .pluginConfigurations:
             guard let pluginsContent = applicationData.pluginsUrlContent() else {
-                rejecter("7", Errors.canNotGetPluginsContent, nil)
+                rejecter(Errors.canNotGetPluginsContent.code, Errors.canNotGetPluginsContent.message, nil)
                 return
             }
 
             let jsonString = JsonHelper.convertObjectToJsonString(object: pluginsContent, options: [])
             resolver(jsonString)
         case .layout:
-            guard let layoutId = getLayoutId() else {
-                resolver(applicationData.layoutUrlContent()?.getJsonString())
+            guard let layoutId = getActiveOrDefaultFallbackLayoutId() else {
+                if let layoutContent = applicationData.layoutUrlContent() {
+                    let layoutContentJsonString = layoutContent.getJsonString()
+                    resolver(layoutContentJsonString)
+
+                } else {
+                    rejecter(Errors.canNotGetOriginLayoutContent.code, Errors.canNotGetOriginLayoutContent.message, nil)
+                }
                 return
             }
 
             applicationData.layoutUrlContent(for: layoutId) { layoutUrlContent in
                 guard let layoutUrlContent = layoutUrlContent else {
-                    rejecter("4", Errors.switchToNewLayoutMessage, nil)
+                    rejecter(Errors.canNotGetLayoutContentFromId.code, Errors.canNotGetLayoutContentFromId.message, nil)
                     return
                 }
 
                 resolver(layoutUrlContent.getJsonString())
             }
-        case .styles:
-            guard let layoutId = getLayoutId() else {
-                resolver(applicationData.stylesUrlContent()?.getJsonString())
+        case .cellStyles:
+            guard let layoutId = getActiveOrDefaultFallbackLayoutId() else {
+                if let cellStylesContent = applicationData.cellStylesUrlContent() {
+                    let cellStylesContentJsonString = cellStylesContent.getJsonString()
+                    resolver(cellStylesContentJsonString)
+                } else {
+                    rejecter(Errors.canNotGetOriginCellStylesContent.code, Errors.canNotGetOriginCellStylesContent.message, nil)
+                }
                 return
             }
 
             applicationData.cellStylesUrlContent(for: layoutId) { cellStylesUrlContent in
                 guard let cellStylesUrlContent = cellStylesUrlContent else {
-                    rejecter("4", Errors.switchToNewLayoutMessage, nil)
+                    rejecter(Errors.canNotGetCellStylesContent.code, Errors.canNotGetCellStylesContent.message, nil)
                     return
                 }
 
                 resolver(cellStylesUrlContent.getJsonString())
             }
-        case .cellStyles:
-            guard let cellStylesData = applicationData.cellStylesUrlContent() else {
-                rejecter("9", Errors.canNotGetCellStylesContent, nil)
+        case .styles:
+            guard let stylesURLContent = applicationData.stylesUrlContent() else {
+                rejecter(Errors.canNotGetStylesContent.code, Errors.canNotGetStylesContent.message, nil)
                 return
             }
-            resolver(cellStylesData.getJsonString())
+
+            let stylesURLContentJsonString = stylesURLContent.getJsonString()
+            resolver(stylesURLContentJsonString)
         case .pipesEndpoints:
             guard let pipesEndpointContent = applicationData.pipesEndpointContent() else {
-                rejecter("8", Errors.canNotGetPipesEndpointContent, nil)
+                rejecter(Errors.canNotGetPipesEndpointContent.code, Errors.canNotGetPipesEndpointContent.message, nil)
                 return
             }
             resolver(pipesEndpointContent.getJsonString())
@@ -131,22 +151,22 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
                                    rejecter: @escaping RCTPromiseRejectBlock) {
         // Construct the layout and cell_style URLS
         guard let applicationData = FacadeConnector.connector?.applicationData else {
-            rejecter("2", Errors.canNotAccessAppData, nil)
+            rejecter(Errors.canNotAccessAppData.code, Errors.canNotAccessAppData.message, nil)
             return
         }
 
         applicationData.layoutUrlContent(for: layoutId) { layoutUrlContent in
             guard let _ = layoutUrlContent else {
-                rejecter("4", Errors.switchToNewLayoutMessage, nil)
+                rejecter(Errors.switchToNewLayoutMessage.code, Errors.switchToNewLayoutMessage.message, nil)
                 return
             }
 
             applicationData.cellStylesUrlContent(for: layoutId) { cellStylesUrlContent in
                 DispatchQueue.main.async {
                     guard let _ = cellStylesUrlContent,
-                          self.saveLayoutId(id: layoutId)
+                          self.saveActiveLayoutId(id: layoutId)
                     else {
-                        rejecter("4", Errors.switchToNewLayoutMessage, nil)
+                        rejecter(Errors.switchToNewLayoutMessage.code, Errors.switchToNewLayoutMessage.message, nil)
                         return
                     }
                     resolver(true)
@@ -158,7 +178,7 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
     // get the current layout id
     @objc public func getCurrentLayoutId(_ resolve: @escaping RCTPromiseResolveBlock,
                                          rejecter: @escaping RCTPromiseRejectBlock) {
-        guard let layoutId = getLayoutId() else {
+        guard let layoutId = getActiveOrDefaultFallbackLayoutId() else {
             getDefaultLayoutId(resolve, rejecter: rejecter)
             return
         }
@@ -169,14 +189,19 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
     // get the defualt layout id
     @objc public func getDefaultLayoutId(_ resolve: @escaping RCTPromiseResolveBlock,
                                          rejecter: @escaping RCTPromiseRejectBlock) {
+        if let cachedDefaultLayoutId = FacadeConnector.connector?.storage?.localStorageValue(for: Consts.defaultLayoutId, namespace: nil) {
+            resolve(cachedDefaultLayoutId)
+            return
+        }
+
         guard let applicationData = FacadeConnector.connector?.applicationData else {
-            rejecter("2", Errors.canNotAccessAppData, nil)
+            rejecter(Errors.canNotAccessAppData.code, Errors.canNotAccessAppData.message, nil)
             return
         }
 
         let layoutId = applicationData.layoutId()
         guard layoutId.isEmpty == false else {
-            rejecter("3", Errors.parameterDoesNotExist, nil)
+            rejecter(Errors.parameterDoesNotExist.code, Errors.parameterDoesNotExist.message, nil)
             return
         }
         resolve(layoutId)
@@ -184,14 +209,20 @@ class AppLoaderBridge: NSObject, RCTBridgeModule {
 
     // MARK: - Private Methods
 
-    private func saveLayoutId(id: String) -> Bool {
-        FacadeConnector.connector?.storage?.sessionStorageSetValue(for: Consts.currentLayoutId,
+    private func saveActiveLayoutId(id: String) -> Bool {
+        FacadeConnector.connector?.storage?.sessionStorageSetValue(for: Consts.activeLayoutId,
                                                                    value: id,
                                                                    namespace: nil) ?? false
     }
 
-    private func getLayoutId() -> String? {
-        FacadeConnector.connector?.storage?.sessionStorageValue(for: Consts.currentLayoutId,
-                                                                namespace: nil)
+    private func getActiveOrDefaultFallbackLayoutId() -> String? {
+        guard let layoutId = FacadeConnector.connector?.storage?.sessionStorageValue(for: Consts.activeLayoutId,
+                                                                                     namespace: nil) ??
+            FacadeConnector.connector?.storage?.localStorageValue(for: Consts.defaultLayoutId,
+                                                                  namespace: nil) else {
+            logger?.errorLog(message: "getActiveOrDefaultFallbackLayoutId: Can not find active layout id or default layout id. Please check application configuration")
+            return nil
+        }
+        return layoutId
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-native-apple",
-  "version": "5.20.2",
+  "version": "5.20.4",
   "description": "iOS and tvOS native code for QuickBrick applications. This package is used to provide native logic for QuickBrick",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"