@applicaster/quick-brick-core 15.0.0-rc.129 → 15.0.0-rc.131

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/__tests__/usePresentSchemeHandler.test.tsx

@@ -1,14 +1,11 @@
-import * as R from "ramda";
 import axios from "axios";
-import { renderHook } from "@testing-library/react-native";
+import { renderHook, waitFor } from "@testing-library/react-native";
 import { sessionStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage";
 import * as helpers from "../../../helpers";
 import * as feedLoader from "@applicaster/zapp-react-native-utils/reactHooks/feed/useFeedLoader";
 import { WrappedWithProviders } from "@applicaster/zapp-react-native-utils/testUtils";
 import { usePresentSchemeHandler } from "../usePresentSchemeHandler";
 
-import configureStore from "redux-mock-store";
-
 const rivers = {
   A1234: {
     id: "A1234",
@@ -28,8 +25,6 @@ jest.mock(
   })
 );
 
-const mockStore = configureStore();
-
 const helperSpy = jest.spyOn(helpers, "handlePresentNavigation");
 const feedLoaderSpy = jest.spyOn(feedLoader, "useFeedLoader");
 
@@ -179,46 +174,88 @@ describe("usePresentSchemeHandler", () => {
   });
 
   describe("loading new river", () => {
-    it("Re-sets app ready state and calls loadAppContextData with new river and cellStyles data", async () => {
-      const store = mockStore({ test: "test" });
-
-      const wrapper = WrappedWithProviders;
+    const query = { rivers_configuration_id: "layout-uuid" };
 
-      const query = {
-        rivers_configuration_id: "test",
-      };
+    const baseSessionData = {
+      accountsAccountId: "account-123",
+      bundleIdentifier: "com.example.app",
+      app_family_id: "42",
+      version_name: "1.0.0",
+    };
 
-      const storageSpy = jest.spyOn(sessionStorage, "getAllItems");
-      const axiosGetSpy = jest.spyOn(axios, "get");
+    let storageSpy: jest.SpyInstance;
+    let axiosGetSpy: jest.SpyInstance;
 
-      const getAllItems = jest.fn().mockResolvedValue({
-        accountsAccountId: "accountsAccountId",
-        bundleIdentifier: "bundleIdentifier",
-        app_family_id: "app_family_id",
-        version_name: "version_name",
-        store: "store",
-      });
+    beforeEach(() => {
+      storageSpy = jest.spyOn(sessionStorage, "getAllItems");
+      axiosGetSpy = jest.spyOn(axios, "get");
+      axiosGetSpy.mockResolvedValue({ data: {} });
+    });
 
-      const get = jest.fn().mockResolvedValue({ data: "url" });
+    afterEach(() => {
+      storageSpy.mockRestore();
+      axiosGetSpy.mockRestore();
+    });
 
-      storageSpy.mockImplementation(getAllItems);
-      axiosGetSpy.mockImplementation(get);
+    it("fetches the rivers, cell styles and presets mapping URLs", async () => {
+      storageSpy.mockResolvedValue({ ...baseSessionData, store: "store" });
 
       renderHook(() => usePresentSchemeHandler({ query, url: "", onFinish }), {
-        wrapper,
+        wrapper: WrappedWithProviders,
       });
 
-      return () => {
-        const actions = store.getActions();
-
-        expect(
-          actions?.find(R.propEq("type", "SET_APP_NOT_READY"))
-        ).toBeDefined();
+      await waitFor(() => {
+        expect(axiosGetSpy).toHaveBeenCalledWith(
+          expect.stringContaining("/layouts/layout-uuid.json")
+        );
+      });
+    });
 
-        expect(actions?.find(R.propEq("type", "SET_APP_READY"))).toBeDefined();
+    describe("WEB_STORE_PLATFORM CDN store key mapping", () => {
+      it.each([
+        ["samsung", "samsung_app_store"],
+        ["lg", "lg_content_store"],
+        ["vizio", "vizio_app_store"],
+      ])(
+        'maps store="%s" to "%s" in the rivers URL',
+        async (store, expectedCdnKey) => {
+          storageSpy.mockResolvedValue({ ...baseSessionData, store });
+
+          renderHook(
+            () => usePresentSchemeHandler({ query, url: "", onFinish }),
+            { wrapper: WrappedWithProviders }
+          );
+
+          await waitFor(() => {
+            expect(axiosGetSpy).toHaveBeenCalledWith(
+              expect.stringContaining(`/${expectedCdnKey}/`)
+            );
+          });
+
+          // Confirm the raw store name is NOT used in the URL
+          expect(axiosGetSpy).not.toHaveBeenCalledWith(
+            expect.stringContaining(`/${store}/`)
+          );
+        }
+      );
 
-        expect(navigator.replace).toBeCalledWith({});
-      };
+      it("passes through an unmapped store value unchanged", async () => {
+        storageSpy.mockResolvedValue({
+          ...baseSessionData,
+          store: "apple_tv",
+        });
+
+        renderHook(
+          () => usePresentSchemeHandler({ query, url: "", onFinish }),
+          { wrapper: WrappedWithProviders }
+        );
+
+        await waitFor(() => {
+          expect(axiosGetSpy).toHaveBeenCalledWith(
+            expect.stringContaining("/apple_tv/")
+          );
+        });
+      });
     });
   });
 

package/App/DeepLinking/URLSchemeHandler/SchemeHandlerHooks/usePresentSchemeHandler.ts

@@ -101,26 +101,28 @@ export function usePresentSchemeHandler({
 
         // @ts-ignore - to be fixed on iOS side
         // key accountsAccountID should be accountsAccountId
-        const accountId = getKeyFromStorage<string>(accountKey, sessionData);
+        const accountId = getKeyFromStorage(accountKey, sessionData);
 
-        const appBundleIdentifier = getKeyFromStorage<string>(
+        const appBundleIdentifier = getKeyFromStorage(
           "bundleIdentifier",
           sessionData
         );
 
-        const versionName = getKeyFromStorage<string>(
-          "version_name",
-          sessionData
-        );
+        const versionName = getKeyFromStorage("version_name", sessionData);
 
-        const familyId = getKeyFromStorage<string>(
-          "app_family_id",
-          sessionData
-        );
+        const familyId = getKeyFromStorage("app_family_id", sessionData);
+
+        const storeKey = getKeyFromStorage("store", sessionData);
+
+        const WEB_STORE_PLATFORM: Record<string, string> = {
+          samsung: "samsung_app_store",
+          lg: "lg_content_store",
+          vizio: "vizio_app_store",
+        };
 
-        const storeKey = getKeyFromStorage<string>("store", sessionData);
+        const cdnStoreKey = WEB_STORE_PLATFORM[storeKey] ?? storeKey;
 
-        const riversUrl = `https://assets-secure.applicaster.com/zapp/accounts/${accountId}/apps/${appBundleIdentifier}/${storeKey}/${versionName}/layouts/${rivers_configuration_id}.json`;
+        const riversUrl = `https://assets-secure.applicaster.com/zapp/accounts/${accountId}/apps/${appBundleIdentifier}/${cdnStoreKey}/${versionName}/layouts/${rivers_configuration_id}.json`;
 
         const cellStylesUrl = `https://assets-secure.applicaster.com/zapp/accounts/${accountId}/app_families/${familyId}/layouts/${rivers_configuration_id}/cell_styles.json`;
 

package/App/DeepLinking/URLSchemeListener/URLSchemeContextProvider.tsx

@@ -10,6 +10,7 @@ import * as ReactNative from "react-native";
 
 import { isWeb } from "@applicaster/zapp-react-native-utils/reactUtils";
 import { log_debug, log_error, log_info } from "../logger";
+import { parseUrl } from "../helpers";
 import { getAppUrlScheme } from "@applicaster/zapp-react-native-utils/appDataUtils";
 import {
   getZappPlatform,
@@ -47,6 +48,24 @@ const getWebDeepLink = (initialURL: string) => {
   return getAppUrlScheme() + "://open" + initialURL.slice(index);
 };
 
+const getPresentDeepLink = (
+  initialURL: string | null | undefined
+): string | null => {
+  if (!initialURL) return null;
+
+  const index = initialURL.indexOf("?");
+  if (index === -1) return null;
+
+  const { query } = parseUrl(initialURL);
+  if (!query?.rivers_configuration_id) return null;
+
+  return getAppUrlScheme() + "://present" + initialURL.slice(index);
+};
+
+export const triggerUrlScheme = (url: string): void => {
+  DeviceEventEmitter.emit("handleOpenUrl", { url });
+};
+
 function URLSchemeContextProvider(props: Props) {
   const [state, setState] = useState<string | null>(initialState.url);
 
@@ -67,6 +86,16 @@ function URLSchemeContextProvider(props: Props) {
       const url = await Linking.getInitialURL();
 
       if (isWeb()) {
+        const presentDeepLink = getPresentDeepLink(url);
+
+        if (presentDeepLink) {
+          log_info(
+            `URLSchemeContextProvider: Retrieved initial deep link: ${presentDeepLink}`
+          );
+
+          return setState(presentDeepLink);
+        }
+
         if (getZappPlatform() === ZappPlatform.Vizio) {
           const deepLink = getWebDeepLink(url);
 
@@ -127,6 +156,36 @@ function URLSchemeContextProvider(props: Props) {
       };
     }
 
+    if (isWeb()) {
+      log_debug(
+        `URLSchemeContextProvider: Register DeviceEventEmitter "handleOpenUrl" listener — Platform.OS=${Platform.OS}`
+      );
+
+      const listener = DeviceEventEmitter.addListener(
+        "handleOpenUrl",
+        ({ url: eventUrl }) => {
+          if (eventUrl) {
+            log_info(
+              `URLSchemeContextProvider: DeviceEventEmitter "handleOpenUrl" received — url=${eventUrl}`
+            );
+
+            setState(eventUrl);
+          }
+        }
+      );
+
+      const linkingListener = Linking.addEventListener(
+        URL_EVENT_TYPE,
+        handleOpenURL
+      );
+
+      return () => {
+        log_debug("URLSchemeContextProvider: Remove URL event listeners");
+        listener.remove();
+        linkingListener.remove();
+      };
+    }
+
     log_debug("URLSchemeContextProvider: Register URL event listener");
 
     const listener = Linking.addEventListener(URL_EVENT_TYPE, handleOpenURL);

package/App/DeepLinking/helpers/index.ts

@@ -120,13 +120,13 @@ export function isInternalUrl(url = "") {
   return query?.isInternalLink;
 }
 
-export function getKeyFromStorage<T extends unknown>(
+export function getKeyFromStorage(
   key: keyof SessionStorageKeys,
   sessionData: Partial<SessionStorageKeys>
-): T {
+): string {
   if (!sessionData[key]) {
     throw new Error(`${key} is not available in session storage data`);
   }
 
-  return R.compose(R.replace(/"/g, ""), R.prop(key))(sessionData);
+  return String(sessionData[key]).replace(/"/g, "");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "15.0.0-rc.129",
+  "version": "15.0.0-rc.131",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -28,13 +28,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "15.0.0-rc.129",
-    "@applicaster/quick-brick-core-plugins": "15.0.0-rc.129",
-    "@applicaster/zapp-pipes-v2-client": "15.0.0-rc.129",
-    "@applicaster/zapp-react-native-bridge": "15.0.0-rc.129",
-    "@applicaster/zapp-react-native-redux": "15.0.0-rc.129",
-    "@applicaster/zapp-react-native-ui-components": "15.0.0-rc.129",
-    "@applicaster/zapp-react-native-utils": "15.0.0-rc.129",
+    "@applicaster/applicaster-types": "15.0.0-rc.131",
+    "@applicaster/quick-brick-core-plugins": "15.0.0-rc.131",
+    "@applicaster/zapp-pipes-v2-client": "15.0.0-rc.131",
+    "@applicaster/zapp-react-native-bridge": "15.0.0-rc.131",
+    "@applicaster/zapp-react-native-redux": "15.0.0-rc.131",
+    "@applicaster/zapp-react-native-ui-components": "15.0.0-rc.131",
+    "@applicaster/zapp-react-native-utils": "15.0.0-rc.131",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",