@applicaster/quick-brick-core 13.0.0-rc.6 → 13.0.0-rc.60

package/App/NetworkStatusProvider/utils.ts

@@ -1,4 +1,3 @@
-/// <reference types="@types/tizen-tv-webapis" />
 import * as R from "ramda";
 
 import { NetInfoState } from "@react-native-community/netinfo";

package/App/RouteManager/__tests__/__snapshots__/routeManager.test.js.snap

@@ -4,8 +4,8 @@ exports[`<RouteManager /> renders correctly 1`] = `
 <RNCSafeAreaProvider
   onInsetsChange={[Function]}
   style={
-    Array [
-      Object {
+    [
+      {
         "flex": 1,
       },
       undefined,

package/App/StoreConnector/__tests__/storeConnector.test.js

@@ -1,19 +1,19 @@
 import * as React from "react";
 import * as ReactIs from "react-is";
 import { View, Text } from "react-native";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
 import configureStore from "redux-mock-store";
 
 import { storeConnector } from "../index";
+import { Provider } from "react-redux";
 
 const styles = { foo: "bar" };
 const components = { grid: jest.fn() };
 const rivers = { A123: { name: "home", id: "A123" } };
 const appSettings = { bundleIdentifier: "com.app.test" };
 
-const Component = () => (
-  <View>
+const Component = (props) => (
+  <View testID="test-comp" {...props}>
     <Text>I'm a component</Text>
   </View>
 );
@@ -28,7 +28,6 @@ const store = configureStore()({
 describe("storeConnector", () => {
   it("returns a Component", () => {
     const WrappedComponent = storeConnector(Component);
-
     expect(ReactIs.isValidElementType(WrappedComponent)).toBe(true);
 
     expect(WrappedComponent).toEqual(
@@ -41,12 +40,19 @@ describe("storeConnector", () => {
 
   it("passes the props to the component", () => {
     const WrappedComponent = storeConnector(Component);
-    const wrapper = shallow(<WrappedComponent store={store} />).dive();
-    const wrapperProps = wrapper.first().props();
 
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
-    expect(wrapperProps).toHaveProperty("components", components);
-    expect(wrapperProps).toHaveProperty("rivers", rivers);
-    expect(wrapperProps).toHaveProperty("appSettings", appSettings);
+    const { getByText, getByTestId } = render(
+      <Provider store={store}>
+        <WrappedComponent />
+      </Provider>
+    );
+
+    expect(getByText("I'm a component")).toBeTruthy();
+
+    expect(getByTestId("test-comp").props).toMatchObject({
+      appSettings,
+      components,
+      rivers,
+    });
   });
 });

package/App/appLifeCycleManager/__tests__/appLifeCycleManager.test.tsx

@@ -0,0 +1,146 @@
+import * as React from "react";
+import { View, Text } from "react-native";
+import { render, waitFor } from "@testing-library/react-native";
+import thunk from "redux-thunk";
+import configureStore from "redux-mock-store";
+
+let mocked_items: Record<string, any> = {};
+
+import { appLifeCycleManager } from "../";
+
+const mock_actions = {};
+
+jest.mock("@applicaster/zapp-react-native-redux/AppData", () => ({
+  loadAppData: jest.fn(() => () => Promise.resolve()),
+}));
+
+jest.mock("@applicaster/zapp-react-native-utils/reactHooks/actions", () => ({
+  useActions: jest.fn(() => ({ actions: mock_actions })),
+}));
+
+jest.mock(
+  "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage",
+  () => ({
+    localStorage: {
+      getAllItems: jest.fn(() => Promise.resolve(mocked_items)),
+      setItem: jest.fn((key, value) => {
+        mocked_items[key] = JSON.stringify(value);
+
+        return Promise.resolve(true);
+      }),
+      getItem: jest.fn((key) => {
+        if (mocked_items[key]) {
+          if (typeof mocked_items[key] === "string") {
+            return Promise.resolve(JSON.parse(mocked_items[key]));
+          } else {
+            return Promise.resolve(mocked_items[key]);
+          }
+        } else {
+          return Promise.resolve([]);
+        }
+      }),
+      __reset() {
+        mocked_items = {};
+      },
+    },
+  })
+);
+
+const Component = () => (
+  <View>
+    <Text>I'm a component</Text>
+  </View>
+);
+
+const QuickBrickManager = {
+  sendQuickBrickEvent: jest.fn(),
+};
+
+const LOADING_ERROR = new Error("loading failed");
+
+const appLoader = jest.fn((_dispatch, _getState) => {
+  if (_getState().shouldFail) return Promise.reject(LOADING_ERROR);
+
+  return Promise.resolve();
+});
+
+const store = configureStore([thunk])({});
+const dispatch = store.dispatch;
+
+const state = {
+  rivers: {},
+  plugins: {},
+  appSettings: { runtimeConfigurationUrls: { rivers: "http://rivers.url" } },
+};
+
+const QUICK_BRICK_READY_EVENT = "quickBrickReady";
+
+describe("appLifeCycleManager", () => {
+  const decorator = appLifeCycleManager(appLoader, QuickBrickManager);
+  const DecoratedComponent = decorator(Component);
+
+  beforeEach(() => {
+    appLoader.mockClear();
+    QuickBrickManager.sendQuickBrickEvent.mockClear();
+  });
+
+  it("returns a function to decorate a component", () => {
+    expect(decorator).toBeDefined();
+  });
+
+  it("runs the loaders, then sends quickBrickReady event", async () => {
+    const testCallback = jest.fn(() => {});
+
+    render(
+      <DecoratedComponent
+        dispatch={dispatch}
+        {...state}
+        testCallback={testCallback}
+      />
+    );
+
+    await waitFor(() => {
+      return expect(testCallback).toHaveBeenCalled();
+    });
+
+    const actions = store.getActions();
+
+    expect(actions[0]).toMatchObject({ type: "SET_APP_READY" });
+
+    expect(QuickBrickManager.sendQuickBrickEvent).toHaveBeenCalledWith(
+      QUICK_BRICK_READY_EVENT
+    );
+
+    expect(appLoader).toHaveBeenCalled();
+  });
+
+  it("sends the quickBrickReady event when a loader doesn't resolves", async () => {
+    const testCallback = jest.fn(() => {});
+
+    render(
+      <DecoratedComponent
+        dispatch={dispatch}
+        {...state}
+        shouldFail
+        testCallback={testCallback}
+      />
+    );
+
+    const actions = store.getActions();
+
+    await waitFor(() => {
+      return expect(testCallback).toHaveBeenCalled();
+    });
+
+    expect(actions[0]).toMatchObject({ type: "SET_APP_READY" });
+    expect(actions[1]).toMatchObject({ type: "SET_APP_LAUNCHED" });
+
+    expect(QuickBrickManager.sendQuickBrickEvent).toHaveBeenCalledWith(
+      QUICK_BRICK_READY_EVENT
+    );
+
+    expect(testCallback).toHaveBeenCalled();
+
+    expect(appLoader).toHaveBeenCalled();
+  });
+});

package/App/appLifeCycleManager/index.tsx

@@ -131,9 +131,8 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
             )
             .map((plugin: any) => plugin.module?.getLoginProtocol?.());
 
-          const loginProtocols: LoginProtocol[] = await Promise.all(
-            promiseProtocols
-          );
+          const loginProtocols: LoginProtocol[] =
+            await Promise.all(promiseProtocols);
 
           // Await all does not work here
           for (const protocol of loginProtocols) {
@@ -183,13 +182,13 @@ export function appLifeCycleManager(appLoader, QuickBrickManager) {
             data: { error },
           });
         }
-
-        makeAppReady();
-        checkStoredContextKeys();
       };
 
       React.useLayoutEffect(() => {
-        prepareApp();
+        prepareApp().then(() => {
+          makeAppReady();
+          checkStoredContextKeys();
+        });
       }, []);
 
       return <Component {...props} />;

package/App/index.tsx

@@ -29,6 +29,7 @@ import { appRemoteDataLoader } from "./appRemoteDataLoader";
 import { withActionExecutor } from "@applicaster/zapp-react-native-utils/actionsExecutor/ActionExecutorContext";
 import { withScreenDataContextProvider } from "@applicaster/zapp-react-native-ui-components/Contexts/ScreenDataContext";
 import { LogicAggregatorContainer } from "./LogicAggregatorContainer";
+import { LoadingOverlay } from "./LoadingOverlay";
 
 interface AppOptions {
   Layout: React.ComponentType;
@@ -74,6 +75,7 @@ const App = ({
               <LogicAggregatorContainer
                 components={[InteractionManager, ApplyScreenHooks]}
               />
+              <LoadingOverlay />
             </ErrorBoundary>
           </AppContainer>
         </SafeAreaProvider>

package/App/remoteContextReloader/__tests__/remoteContextReloader.test.js

@@ -1,7 +1,6 @@
 import * as React from "react";
 import { View, Text } from "react-native";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render } from "@testing-library/react-native";
 
 import { remoteContextReloader } from "../index";
 import * as ContextReloader from "../getRemoteContextData";
@@ -25,19 +24,21 @@ const dispatch = jest.fn();
 
 describe("remoteContextReloader", () => {
   const WrappedComponent = remoteContextReloader(Component);
+  let rendered;
+
+  beforeEach(() => {
+    rendered = render(
+      <WrappedComponent {...{ appSettings, plugins, dispatch }} />
+    );
+  });
 
   afterEach(() => {
     jest.clearAllMocks();
   });
 
-  it("adds a componentDidMount method", () => {
-    const wrapper = shallow(
-      <WrappedComponent {...{ appSettings, plugins, dispatch }} />
-    );
-
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
-    expect(wrapper.instance()).toHaveProperty("componentDidMount");
-    expect(wrapper.instance().componentDidMount).toBeFunction();
+  it("calls componentDidMount and renders correctly", () => {
+    const { getByText } = rendered;
+    expect(getByText("I'm a component")).toBeTruthy();
   });
 
   describe("when in __DEV__", () => {
@@ -47,11 +48,6 @@ describe("remoteContextReloader", () => {
     });
 
     it("doesn't invoke the context reloader", () => {
-      const wrapper = shallow(
-        <WrappedComponent {...{ appSettings, plugins, dispatch }} />
-      );
-
-      expect(shallowToJson(wrapper)).toMatchSnapshot();
       expect(spy).not.toHaveBeenCalled();
     });
   });
@@ -62,12 +58,6 @@ describe("remoteContextReloader", () => {
     });
 
     it("invokes the context reloader", () => {
-      const wrapper = shallow(
-        <WrappedComponent {...{ appSettings, plugins, dispatch }} />
-      );
-
-      expect(shallowToJson(wrapper)).toMatchSnapshot();
-
       expect(spy).toHaveBeenCalledWith(
         dispatch,
         appSettings.runtimeConfigurationUrls,

package/App/remoteContextReloader/consts.ts

@@ -19,3 +19,5 @@ export const TYPE_KEYS = [
   "layout",
   "pipesEndpoints",
 ];
+
+export const ACTIVE_LAYOUT_ID_STORAGE_KEY = "active_layout_id";

package/App/remoteContextReloader/getRemoteContextData/getNativeRemoteContextData.ts

@@ -1,5 +1,5 @@
 import * as R from "ramda";
-import { Dimensions } from "react-native";
+import { Dimensions, NativeModules } from "react-native";
 import { loadAppContextData } from "@applicaster/zapp-react-native-redux";
 import { isTablet } from "@applicaster/zapp-react-native-utils/reactHooks";
 import { mapPromises } from "@applicaster/zapp-react-native-utils/arrayUtils";
@@ -7,6 +7,9 @@ import { fetchPluginConfiguration, getPromiseForType } from "../helpers";
 import { cacheAssets } from "../../AssetCache";
 import { actions as appDataActions } from "@applicaster/zapp-react-native-redux/AppData";
 import { logger } from "@applicaster/zapp-react-native-utils/logger";
+import { ACTIVE_LAYOUT_ID_STORAGE_KEY } from "../consts";
+const { AppLoaderBridge } = NativeModules;
+import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
 
 export async function getNativeRemoteContextData(
   dispatch,
@@ -33,11 +36,19 @@ export async function getNativeRemoteContextData(
       R.pathSatisfies(R.is(Function), ["module", "selectLayout"])
     )(plugins);
 
-    await layoutManagerPlugin?.module?.selectLayout({
-      runtimeConfigurationUrls,
-      plugin: layoutManagerPlugin,
-      isTablet: isTabletDevice,
-    });
+    if (layoutManagerPlugin) {
+      await layoutManagerPlugin.module?.selectLayout({
+        runtimeConfigurationUrls,
+        plugin: layoutManagerPlugin,
+        isTablet: isTabletDevice,
+      });
+    } else {
+      const layoutId = await localStorage.getItem(ACTIVE_LAYOUT_ID_STORAGE_KEY);
+
+      if (layoutId) {
+        await AppLoaderBridge?.switchLayout(layoutId, null);
+      }
+    }
   } catch (error) {
     logger.error({
       message: "Error selecting layout using layout manager plugin",

package/createZappApp/__tests__/__snapshots__/createZappApp.test.js.snap

@@ -1,132 +1,9 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`createZappApp has a <Provider /> component with an initialized store 1`] = `
-Object {
-  "appData": Object {
-    "countryLocale": "GB",
-    "languageLocale": "en",
-    "layoutVersion": "v1",
-    "quickBrickEvent": [MockFunction],
-  },
-  "appSettings": Object {
-    "runtimeConfigurationUrls": Object {},
-  },
-  "appState": Object {
-    "appLaunched": false,
-    "appReady": false,
-    "appState": Object {
-      "currentState": null,
-      "eventType": null,
-      "isAvailable": null,
-      "nextState": null,
-    },
-  },
-  "cellStyles": Object {},
-  "components": Object {
-    "AppContainer": [Function],
-    "ContentScreen": [Function],
-    "HookRenderer": [Function],
-    "ModalComponent": [Function],
-    "PlayerContainer": Object {
-      "$$typeof": Symbol(react.memo),
-      "WrappedComponent": Object {
-        "$$typeof": Symbol(react.memo),
-        "compare": null,
-        "type": [Function],
-      },
-      "compare": null,
-      "type": [Function],
-    },
-    "QBImage": [Function],
-    "River": Object {
-      "$$typeof": Symbol(react.memo),
-      "WrappedComponent": [Function],
-      "compare": null,
-      "type": [Function],
-    },
-    "TextInputTv": Object {
-      "$$typeof": Symbol(react.forward_ref),
-      "render": [Function],
-    },
-    "Touchable": [Function],
-  },
-  "contentTypes": null,
-  "localizations": Object {},
-  "pipesEndpoints": null,
-  "pluginConfigurations": Object {
-    "pc1": Object {
-      "configuration_json": null,
-      "plugin": Object {
-        "api": Object {},
-        "identifier": "pc1",
-      },
-    },
-    "pc2": Object {
-      "configuration_json": Object {
-        "foo": "bar",
-      },
-      "plugin": Object {
-        "api": Object {},
-        "identifier": "pc2",
-      },
-    },
-  },
-  "plugins": Array [
-    Object {
-      "configuration": null,
-      "identifier": "pc1",
-      "module": [MockFunction],
-      "name": "Plugin1",
-      "type": "general",
-    },
-    Object {
-      "configuration": Object {
-        "foo": "bar",
-      },
-      "identifier": "pc2",
-      "module": [MockFunction],
-      "name": "Plugin2",
-      "type": "general",
-    },
-  ],
-  "presetsMapping": Object {},
-  "remoteConfigurations": Object {
-    "localizations": Object {},
-  },
-  "rivers": Object {},
-  "styles": Object {},
-  "zappPipes": Object {},
-}
-`;
-
 exports[`createZappApp renders the provided React App 1`] = `
-<Provider
-  store={
-    Object {
-      "@@observable": [Function],
-      "dispatch": [Function],
-      "getState": [Function],
-      "replaceReducer": [Function],
-      "subscribe": [Function],
-    }
-  }
->
-  <EmptyZappApp />
-</Provider>
-`;
-
-exports[`createZappApp returns a react component 1`] = `
-<Provider
-  store={
-    Object {
-      "@@observable": [Function],
-      "dispatch": [Function],
-      "getState": [Function],
-      "replaceReducer": [Function],
-      "subscribe": [Function],
-    }
-  }
->
-  <EmptyZappApp />
-</Provider>
+<View>
+  <Text>
+    Welcome to the QuickBrick App
+  </Text>
+</View>
 `;

package/createZappApp/__tests__/createZappApp.test.js

@@ -1,7 +1,6 @@
 import * as React from "react";
 import { View, Text } from "react-native";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
+import { render, screen } from "@testing-library/react-native";
 import QuickBrickComponents from "@applicaster/zapp-react-native-ui-components";
 import { Provider } from "react-redux";
 
@@ -77,27 +76,17 @@ jest.mock("@applicaster/zapp-react-native-bridge/QuickBrick", () => ({
 }));
 
 describe("createZappApp", () => {
-  it("returns a react component", () => {
-    const ZappApp = createZappApp({});
-    const wrapper = shallow(<ZappApp />);
-
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
-  });
-
   it("renders the provided React App", () => {
     const ZappApp = createZappApp({ App });
-    const wrapper = shallow(<ZappApp />);
-
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    render(<ZappApp />);
+    expect(screen.toJSON()).toMatchSnapshot();
   });
 
-  it("has a <Provider /> component with an initialized store", () => {
+  it("has a Provider component with an initialized store", () => {
     const ZappApp = createZappApp(zappAppConfig);
-    const wrapper = shallow(<ZappApp />);
-
-    const providerNode = wrapper.find(Provider);
-    const store = providerNode.prop("store");
-    expect(providerNode.length).toBe(1);
+    const { UNSAFE_root } = render(<ZappApp />);
+    const providerInstance = UNSAFE_root.findByType(Provider);
+    const store = providerInstance.props.store;
 
     expect(store).toEqual(
       expect.objectContaining({
@@ -108,8 +97,6 @@ describe("createZappApp", () => {
       })
     );
 
-    expect(store.getState()).toMatchSnapshot();
-
     expect(store.getState()).toEqual(
       expect.objectContaining({
         styles: expect.any(Object),

package/defaults/__tests__/defaults.test.js

@@ -1,11 +1,10 @@
 import React from "react";
+import { render } from "@testing-library/react-native";
 import { EmptyZappApp } from "../index";
-import { shallow } from "enzyme";
-import { shallowToJson } from "enzyme-to-json";
 
 describe("<EmptyZappApp />", () => {
   it("renders correctly", () => {
-    const wrapper = shallow(<EmptyZappApp />);
-    expect(shallowToJson(wrapper)).toMatchSnapshot();
+    const { toJSON } = render(<EmptyZappApp />);
+    expect(toJSON()).toMatchSnapshot();
   });
 });

package/index.d.ts

@@ -24,7 +24,7 @@ type AnyValue = void | string | number | boolean | AnyArray | AnyRecord;
 declare type ReducerAction<
   T extends string = string,
   P extends AnyValue = AnyValue,
-  M extends AnyRecord = AnyRecord
+  M extends AnyRecord = AnyRecord,
 > = {
   type: T;
   payload?: P;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@applicaster/quick-brick-core",
-  "version": "13.0.0-rc.6",
+  "version": "13.0.0-rc.60",
   "description": "Core package for Applicaster's Quick Brick App",
   "main": "index.js",
   "types": "index.d.ts",
@@ -29,13 +29,13 @@
   },
   "homepage": "https://github.com/applicaster/quickbrick#readme",
   "dependencies": {
-    "@applicaster/applicaster-types": "13.0.0-rc.6",
-    "@applicaster/quick-brick-core-plugins": "13.0.0-rc.6",
-    "@applicaster/zapp-pipes-v2-client": "13.0.0-rc.6",
-    "@applicaster/zapp-react-native-bridge": "13.0.0-rc.6",
-    "@applicaster/zapp-react-native-redux": "13.0.0-rc.6",
-    "@applicaster/zapp-react-native-ui-components": "13.0.0-rc.6",
-    "@applicaster/zapp-react-native-utils": "13.0.0-rc.6",
+    "@applicaster/applicaster-types": "13.0.0-rc.60",
+    "@applicaster/quick-brick-core-plugins": "13.0.0-rc.60",
+    "@applicaster/zapp-pipes-v2-client": "13.0.0-rc.60",
+    "@applicaster/zapp-react-native-bridge": "13.0.0-rc.60",
+    "@applicaster/zapp-react-native-redux": "13.0.0-rc.60",
+    "@applicaster/zapp-react-native-ui-components": "13.0.0-rc.60",
+    "@applicaster/zapp-react-native-utils": "13.0.0-rc.60",
     "atob": "^2.1.2",
     "axios": "^0.28.0",
     "btoa": "^1.2.1",
@@ -50,15 +50,28 @@
     "uuid": "3.3.2"
   },
   "peerDependencies": {
+    "@applicaster/blur": "*",
+    "@applicaster/quick-brick-xray": "*",
+    "@applicaster/zapp-react-dom-ui-components": "*",
+    "@applicaster/zapp-react-native-tvos-app": "*",
+    "@applicaster/zapp-react-native-tvos-ui-components": "*",
+    "@babel/runtime": "*",
     "@react-native-community/netinfo": "*",
-    "react": "17.0.2",
-    "react-native": "0.68.6",
+    "immer": "*",
+    "react": "*",
+    "react-native": "*",
+    "react-native-fs": "*",
     "react-native-gesture-handler": "*",
-    "react-native-safe-area-context": "*"
+    "react-native-linear-gradient": "*",
+    "react-native-safe-area-context": "*",
+    "react-native-svg": "*",
+    "react-native-web": "*",
+    "react-native-webview": "*",
+    "uglify-js": "*",
+    "validate-color": "*",
+    "zustand": "*"
   },
   "devDependencies": {
-    "@types/react-native": "0.69.6",
-    "@types/tizen-tv-webapis": "^2.0.1",
     "nock": "^10.0.0",
     "redux-mock-store": "^1.5.3"
   },