@applicaster/zapp-react-native-ui-components 16.0.0-rc.8 → 16.0.0-rc.80
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/Components/AudioPlayer/tv/__tests__/audioPlayer.test.js +19 -0
- package/Components/AudioPlayer/tv/__tests__/index.test.tsx +120 -0
- package/Components/AudioPlayer/tv/index.tsx +5 -1
- package/Components/Cell/Cell.tsx +3 -6
- package/Components/Cell/TvOSCellComponent.tsx +0 -1
- package/Components/CellRendererResolver/index.ts +2 -2
- package/Components/ComponentResolver/__tests__/componentResolver.test.js +1 -1
- package/Components/FocusableGroup/FocusableTvOS.tsx +11 -7
- package/Components/GeneralContentScreen/GeneralContentScreenHookAdapter.tsx +39 -0
- package/Components/GeneralContentScreen/__tests__/GeneralContentScreenHookAdapter.test.tsx +64 -0
- package/Components/GeneralContentScreen/__tests__/HookContentFocusGroup.web.test.tsx +91 -0
- package/Components/GeneralContentScreen/hookAdapter/__tests__/networkService.test.ts +74 -0
- package/Components/GeneralContentScreen/hookAdapter/__tests__/runInBackground.test.ts +139 -0
- package/Components/GeneralContentScreen/hookAdapter/__tests__/skipExpression.test.ts +294 -0
- package/Components/GeneralContentScreen/hookAdapter/__tests__/validationHelper.test.ts +188 -0
- package/Components/GeneralContentScreen/hookAdapter/logger.ts +6 -0
- package/Components/GeneralContentScreen/hookAdapter/networkService.ts +53 -0
- package/Components/GeneralContentScreen/hookAdapter/runInBackground.ts +48 -0
- package/Components/GeneralContentScreen/hookAdapter/skipExpression.ts +252 -0
- package/Components/GeneralContentScreen/hookAdapter/validationHelper.ts +90 -0
- package/Components/GeneralContentScreen/hookFocus/index.tsx +13 -0
- package/Components/GeneralContentScreen/hookFocus/index.web.tsx +69 -0
- package/Components/GeneralContentScreen/index.ts +2 -0
- package/Components/Layout/FullWidthRow.tsx +38 -0
- package/Components/MasterCell/DefaultComponents/ActionButton.tsx +16 -5
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/__tests__/placement.test.ts +47 -21
- package/Components/MasterCell/DefaultComponents/ActionButtonsCore/placement.ts +34 -6
- package/Components/MasterCell/DefaultComponents/Image/hoc/utils/__tests__/withDimensions.test.ts +420 -125
- package/Components/MasterCell/DefaultComponents/Image/hoc/utils/index.ts +114 -19
- package/Components/MasterCell/DefaultComponents/Image/hoc/withDimensions.tsx +19 -8
- package/Components/MasterCell/DefaultComponents/ImageContainer/index.tsx +5 -3
- package/Components/MasterCell/DefaultComponents/PressableView.tsx +29 -9
- package/Components/MasterCell/DefaultComponents/Text/hooks/useText.ts +4 -0
- package/Components/MasterCell/DefaultComponents/Toggle.tsx +36 -14
- package/Components/MasterCell/DefaultComponents/__tests__/Toggle.test.tsx +167 -0
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/ActionButton.tsx +154 -100
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/AssetComponent.tsx +15 -4
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/Button.ts +56 -22
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/Spacer.ts +6 -4
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/TextLabelsContainer.ts +3 -1
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/__tests__/PressableView.test.tsx +32 -21
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/__tests__/index.test.ts +15 -4
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/index.ts +23 -16
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/utils/__tests__/insertButtons.test.ts +8 -3
- package/Components/MasterCell/DefaultComponents/mobile/MobileActionButtons/utils/index.ts +2 -2
- package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/__tests__/insertButtonsBetweenLabels.test.ts +45 -13
- package/Components/MasterCell/DefaultComponents/tv/TvActionButtons/utils/index.ts +2 -2
- package/Components/MasterCell/contexts/PressedStateContext.ts +3 -0
- package/Components/MasterCell/dataAdapter.ts +15 -5
- package/Components/MasterCell/hooks/index.ts +2 -0
- package/Components/MasterCell/hooks/usePressedState.ts +4 -0
- package/Components/MasterCell/index.tsx +30 -5
- package/Components/MasterCell/utils/__tests__/resolveColor.test.js +169 -132
- package/Components/MasterCell/utils/__tests__/resolveColorForProp.test.js +92 -0
- package/Components/MasterCell/utils/index.ts +85 -46
- package/Components/ModalComponent/ActionsBottomSheet/ActionButton.tsx +54 -0
- package/Components/ModalComponent/ActionsBottomSheet/boundActionButton.tsx +21 -0
- package/Components/ModalComponent/ActionsBottomSheet/index.ts +9 -0
- package/Components/ModalComponent/ActionsBottomSheet/openActionsBottomSheet.ts +58 -0
- package/Components/ModalComponent/AudioPlayer/Components/Action.tsx +314 -0
- package/Components/ModalComponent/AudioPlayer/Components/Button.tsx +395 -0
- package/Components/ModalComponent/AudioPlayer/Components/Header.tsx +763 -0
- package/Components/ModalComponent/AudioPlayer/Components/Input.tsx +653 -0
- package/Components/ModalComponent/AudioPlayer/Components/Item.tsx +874 -0
- package/Components/ModalComponent/AudioPlayer/Components/NowPlayingHeaderSection.tsx +89 -0
- package/Components/ModalComponent/AudioPlayer/Components/index.ts +11 -0
- package/Components/ModalComponent/AudioPlayer/utils/mergeStyles.ts +199 -0
- package/Components/ModalComponent/BottomSheetDragArea.tsx +33 -0
- package/Components/ModalComponent/BottomSheetModalContent.tsx +383 -42
- package/Components/ModalComponent/Button/index.tsx +5 -3
- package/Components/ModalComponent/Header/index.tsx +20 -7
- package/Components/ModalComponent/Header/utils.ts +1 -1
- package/Components/ModalComponent/ModalBlocksStyleContext.tsx +10 -0
- package/Components/ModalComponent/SortableList.tsx +142 -0
- package/Components/ModalComponent/SortableList.web.tsx +34 -0
- package/Components/ModalComponent/TextInputContent.tsx +100 -0
- package/Components/ModalComponent/__tests__/BottomSheetDragArea.test.tsx +74 -0
- package/Components/ModalComponent/__tests__/BottomSheetModalContent.test.tsx +238 -0
- package/Components/ModalComponent/__tests__/SortableList.web.test.tsx +16 -0
- package/Components/ModalComponent/__tests__/TextInputContent.test.tsx +120 -0
- package/Components/ModalComponent/__tests__/showTextInput.test.ts +95 -0
- package/Components/ModalComponent/index.tsx +11 -0
- package/Components/ModalComponent/presets/__tests__/getCell.test.ts +66 -0
- package/Components/ModalComponent/presets/dynamicCollectionCell.tsx +78 -0
- package/Components/ModalComponent/presets/index.ts +27 -0
- package/Components/ModalComponent/presets/selectableCell.tsx +28 -0
- package/Components/ModalComponent/presets/standardCell.tsx +41 -0
- package/Components/ModalComponent/presets/types.ts +35 -0
- package/Components/ModalComponent/showTextInput.ts +43 -0
- package/Components/ModalComponent/utils.ts +76 -20
- package/Components/OfflineHandler/__tests__/__snapshots__/index.test.tsx.snap +4 -85
- package/Components/OfflineHandler/__tests__/index.test.tsx +78 -18
- package/Components/OfflineHandler/hooks.ts +123 -0
- package/Components/OfflineHandler/index.tsx +51 -73
- package/Components/OfflineHandler/utils/index.ts +1 -13
- package/Components/PlayerContainer/PlayerContainer.tsx +25 -17
- package/Components/PlayerContainer/ProgramInfo/index.tsx +3 -4
- package/Components/PlayerContainer/__tests__/PlayerContainer.test.tsx +337 -0
- package/Components/PreloaderWrapper/index.tsx +1 -1
- package/Components/River/ComponentsMap/ComponentsMap.tsx +2 -2
- package/Components/River/__tests__/__snapshots__/componentsMap.test.js.snap +3 -15
- package/Components/Screen/index.tsx +8 -4
- package/Components/ScreenFeedLoader/ScreenFeedLoader.tsx +5 -3
- package/Components/ScreenResolverFeedProvider/ScreenResolverFeedProvider.tsx +1 -1
- package/Components/ScreenRevealManager/ScreenRevealManager.ts +18 -2
- package/Components/ScreenRevealManager/__tests__/ScreenRevealManager.test.ts +36 -0
- package/Components/ScreenRevealManager/__tests__/withScreenRevealManager.test.tsx +56 -0
- package/Components/ScreenRevealManager/withScreenRevealManager.tsx +20 -3
- package/Components/TopCutoffOverlay/index.tsx +2 -2
- package/Components/Transitioner/Transitioner.tsx +28 -17
- package/Components/VideoLive/LiveImageManager.ts +1 -1
- package/Components/VideoModal/utils.ts +6 -1
- package/Components/ZappFrameworkComponents/BarView/BarView.tsx +12 -5
- package/Components/ZappFrameworkComponents/BarView/__tests__/BarView.test.tsx +2 -2
- package/Contexts/CachedDimensionsContext/__tests__/index.test.ts +154 -0
- package/Contexts/CachedDimensionsContext/index.ts +17 -2
- package/Helpers/ComponentCellSelectionHelper/index.js +0 -6
- package/Helpers/index.js +0 -39
- package/Hooks/useEntryActionsExpander.ts +63 -0
- package/package.json +6 -5
- package/Components/OfflineHandler/NotificationView/NotificationView.lg.tsx +0 -112
- package/Components/OfflineHandler/NotificationView/NotificationView.samsung.tsx +0 -107
- package/Components/OfflineHandler/NotificationView/NotificationView.tsx +0 -153
- package/Components/OfflineHandler/NotificationView/__tests__/index.test.tsx +0 -66
- package/Components/OfflineHandler/NotificationView/utils.ts +0 -34
- package/Components/Screen/utils.ts +0 -16
- package/Helpers/Analytics/index.js +0 -95
- /package/Components/BackgroundImage/{BackgroundImage.tv.android.tsx → BackgroundImage.android.tv.tsx} +0 -0
- /package/Components/BackgroundImage/{BackgroundImage.tv.ios.tsx → BackgroundImage.ios.tv.tsx} +0 -0
- /package/Components/MasterCell/DefaultComponents/ButtonContainerView/{index.tv.android.tsx → index.android.tv.tsx} +0 -0
- /package/Decorators/ZappPipesDataConnector/__tests__/{Hero.js → Hero.tsx} +0 -0
|
@@ -0,0 +1,139 @@
|
|
|
1
|
+
import { runInBackground } from "../runInBackground";
|
|
2
|
+
import { shouldSkipHook } from "../validationHelper";
|
|
3
|
+
import { requestToSkipHook } from "../networkService";
|
|
4
|
+
|
|
5
|
+
jest.mock("../validationHelper", () => ({
|
|
6
|
+
shouldSkipHook: jest.fn(),
|
|
7
|
+
}));
|
|
8
|
+
|
|
9
|
+
jest.mock("../networkService", () => ({
|
|
10
|
+
requestToSkipHook: jest.fn(),
|
|
11
|
+
}));
|
|
12
|
+
|
|
13
|
+
jest.mock("../logger", () => ({
|
|
14
|
+
log_debug: jest.fn(),
|
|
15
|
+
log_error: jest.fn(),
|
|
16
|
+
log_info: jest.fn(),
|
|
17
|
+
}));
|
|
18
|
+
|
|
19
|
+
const mockShouldSkipHook = shouldSkipHook as jest.Mock;
|
|
20
|
+
const mockRequestToSkipHook = requestToSkipHook as jest.Mock;
|
|
21
|
+
|
|
22
|
+
const item = { id: "entry-1" };
|
|
23
|
+
const endpoint = { source: "https://skip-endpoint", mapping: {} };
|
|
24
|
+
|
|
25
|
+
describe("runInBackground", () => {
|
|
26
|
+
let callback: jest.Mock;
|
|
27
|
+
let presentUI: jest.Mock;
|
|
28
|
+
|
|
29
|
+
beforeEach(() => {
|
|
30
|
+
jest.clearAllMocks();
|
|
31
|
+
callback = jest.fn();
|
|
32
|
+
presentUI = jest.fn();
|
|
33
|
+
mockShouldSkipHook.mockResolvedValue(false);
|
|
34
|
+
mockRequestToSkipHook.mockResolvedValue(false);
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
it("presents the UI when no skip rules are configured", async () => {
|
|
38
|
+
await runInBackground(item, callback, {}, presentUI);
|
|
39
|
+
|
|
40
|
+
expect(presentUI).toHaveBeenCalled();
|
|
41
|
+
expect(callback).not.toHaveBeenCalled();
|
|
42
|
+
expect(mockShouldSkipHook).not.toHaveBeenCalled();
|
|
43
|
+
expect(mockRequestToSkipHook).not.toHaveBeenCalled();
|
|
44
|
+
});
|
|
45
|
+
|
|
46
|
+
it("finishes the hook when a storage key is found, without calling the endpoint", async () => {
|
|
47
|
+
mockShouldSkipHook.mockResolvedValue(true);
|
|
48
|
+
|
|
49
|
+
const configuration = {
|
|
50
|
+
rules: {
|
|
51
|
+
skip_hook_storage_key: "ns.key",
|
|
52
|
+
skip_hook_endpoint: endpoint,
|
|
53
|
+
},
|
|
54
|
+
};
|
|
55
|
+
|
|
56
|
+
await runInBackground(item, callback, configuration, presentUI);
|
|
57
|
+
|
|
58
|
+
expect(mockShouldSkipHook).toHaveBeenCalledWith("ns.key");
|
|
59
|
+
|
|
60
|
+
expect(callback).toHaveBeenCalledWith({
|
|
61
|
+
success: true,
|
|
62
|
+
error: null,
|
|
63
|
+
payload: item,
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
expect(mockRequestToSkipHook).not.toHaveBeenCalled();
|
|
67
|
+
expect(presentUI).not.toHaveBeenCalled();
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
it("falls through to the endpoint check when storage keys are not found", async () => {
|
|
71
|
+
const configuration = {
|
|
72
|
+
rules: {
|
|
73
|
+
skip_hook_storage_key: "ns.key",
|
|
74
|
+
skip_hook_endpoint: endpoint,
|
|
75
|
+
},
|
|
76
|
+
};
|
|
77
|
+
|
|
78
|
+
await runInBackground(item, callback, configuration, presentUI);
|
|
79
|
+
|
|
80
|
+
expect(mockRequestToSkipHook).toHaveBeenCalledWith(endpoint, item);
|
|
81
|
+
expect(presentUI).toHaveBeenCalled();
|
|
82
|
+
expect(callback).not.toHaveBeenCalled();
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
it("finishes the hook when the endpoint allows skipping", async () => {
|
|
86
|
+
mockRequestToSkipHook.mockResolvedValue(true);
|
|
87
|
+
|
|
88
|
+
const configuration = {
|
|
89
|
+
rules: { skip_hook_endpoint: endpoint },
|
|
90
|
+
};
|
|
91
|
+
|
|
92
|
+
await runInBackground(item, callback, configuration, presentUI);
|
|
93
|
+
|
|
94
|
+
expect(callback).toHaveBeenCalledWith({
|
|
95
|
+
success: true,
|
|
96
|
+
error: null,
|
|
97
|
+
payload: item,
|
|
98
|
+
});
|
|
99
|
+
|
|
100
|
+
expect(presentUI).not.toHaveBeenCalled();
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
it("ignores an endpoint configuration without a source", async () => {
|
|
104
|
+
const configuration = {
|
|
105
|
+
rules: { skip_hook_endpoint: { mapping: {} } },
|
|
106
|
+
};
|
|
107
|
+
|
|
108
|
+
await runInBackground(item, callback, configuration, presentUI);
|
|
109
|
+
|
|
110
|
+
expect(mockRequestToSkipHook).not.toHaveBeenCalled();
|
|
111
|
+
expect(presentUI).toHaveBeenCalled();
|
|
112
|
+
});
|
|
113
|
+
|
|
114
|
+
it("presents the UI when the endpoint check throws", async () => {
|
|
115
|
+
mockRequestToSkipHook.mockRejectedValue(new Error("network down"));
|
|
116
|
+
|
|
117
|
+
const configuration = {
|
|
118
|
+
rules: { skip_hook_endpoint: endpoint },
|
|
119
|
+
};
|
|
120
|
+
|
|
121
|
+
await runInBackground(item, callback, configuration, presentUI);
|
|
122
|
+
|
|
123
|
+
expect(presentUI).toHaveBeenCalled();
|
|
124
|
+
expect(callback).not.toHaveBeenCalled();
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
it("presents the UI when the storage check throws", async () => {
|
|
128
|
+
mockShouldSkipHook.mockRejectedValue(new Error("storage error"));
|
|
129
|
+
|
|
130
|
+
const configuration = {
|
|
131
|
+
rules: { skip_hook_storage_key: "ns.key" },
|
|
132
|
+
};
|
|
133
|
+
|
|
134
|
+
await runInBackground(item, callback, configuration, presentUI);
|
|
135
|
+
|
|
136
|
+
expect(presentUI).toHaveBeenCalled();
|
|
137
|
+
expect(callback).not.toHaveBeenCalled();
|
|
138
|
+
});
|
|
139
|
+
});
|
|
@@ -0,0 +1,294 @@
|
|
|
1
|
+
import {
|
|
2
|
+
looksLikeSkipExpression,
|
|
3
|
+
parseSkipExpression,
|
|
4
|
+
evaluateSkipExpression,
|
|
5
|
+
} from "../skipExpression";
|
|
6
|
+
|
|
7
|
+
jest.mock("../logger", () => ({
|
|
8
|
+
log_debug: jest.fn(),
|
|
9
|
+
log_error: jest.fn(),
|
|
10
|
+
log_info: jest.fn(),
|
|
11
|
+
}));
|
|
12
|
+
|
|
13
|
+
const TOKEN = "quick-brick-login-flow.access_token";
|
|
14
|
+
const PROFILE = "user_account.profile";
|
|
15
|
+
|
|
16
|
+
/**
|
|
17
|
+
* Stands in for `getKeyToSkipHook`: resolves a "namespace.key" store, so the
|
|
18
|
+
* expression evaluator is exercised against real lookups rather than mocks.
|
|
19
|
+
*/
|
|
20
|
+
const storage = (store: Record<string, unknown>) =>
|
|
21
|
+
jest.fn((key: string, namespace?: string) =>
|
|
22
|
+
Promise.resolve(store[`${namespace}.${key}`])
|
|
23
|
+
);
|
|
24
|
+
|
|
25
|
+
const evaluate = (expression: unknown, store: Record<string, unknown> = {}) =>
|
|
26
|
+
evaluateSkipExpression(parseSkipExpression(expression), storage(store));
|
|
27
|
+
|
|
28
|
+
describe("looksLikeSkipExpression", () => {
|
|
29
|
+
it("recognises a JSON object, whatever its content", () => {
|
|
30
|
+
expect(looksLikeSkipExpression('{"exists":"ns.key"}')).toBe(true);
|
|
31
|
+
expect(looksLikeSkipExpression(' {"exists":"ns.key"} ')).toBe(true);
|
|
32
|
+
expect(looksLikeSkipExpression({ exists: "ns.key" })).toBe(true);
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
it("recognises a malformed expression, so it is never read as a key list", () => {
|
|
36
|
+
expect(looksLikeSkipExpression('{"any":')).toBe(true);
|
|
37
|
+
});
|
|
38
|
+
|
|
39
|
+
it("rejects a legacy comma-separated key list", () => {
|
|
40
|
+
expect(looksLikeSkipExpression("ns1.key1, ns2.key2")).toBe(false);
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
it("rejects empty and missing input", () => {
|
|
44
|
+
expect(looksLikeSkipExpression("")).toBe(false);
|
|
45
|
+
expect(looksLikeSkipExpression(" ")).toBe(false);
|
|
46
|
+
expect(looksLikeSkipExpression(undefined)).toBe(false);
|
|
47
|
+
});
|
|
48
|
+
});
|
|
49
|
+
|
|
50
|
+
describe("parseSkipExpression", () => {
|
|
51
|
+
it("parses a JSON string into an expression object", () => {
|
|
52
|
+
expect(parseSkipExpression('{"exists":"ns.key"}')).toEqual({
|
|
53
|
+
exists: "ns.key",
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
it("ignores leading and trailing whitespace around the JSON", () => {
|
|
58
|
+
expect(parseSkipExpression(' {"exists":"ns.key"} ')).toEqual({
|
|
59
|
+
exists: "ns.key",
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
|
|
63
|
+
it("accepts an expression that is already an object", () => {
|
|
64
|
+
expect(parseSkipExpression({ exists: "ns.key" })).toEqual({
|
|
65
|
+
exists: "ns.key",
|
|
66
|
+
});
|
|
67
|
+
});
|
|
68
|
+
|
|
69
|
+
it("returns null for a legacy comma-separated key list", () => {
|
|
70
|
+
expect(parseSkipExpression("ns1.key1, ns2.key2")).toBeNull();
|
|
71
|
+
});
|
|
72
|
+
|
|
73
|
+
it("returns null for a malformed JSON object", () => {
|
|
74
|
+
expect(parseSkipExpression('{"exists":')).toBeNull();
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
it("returns null for empty and missing input", () => {
|
|
78
|
+
expect(parseSkipExpression("")).toBeNull();
|
|
79
|
+
expect(parseSkipExpression(undefined)).toBeNull();
|
|
80
|
+
expect(parseSkipExpression(null)).toBeNull();
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
it("returns null for a JSON array, which is not a valid expression", () => {
|
|
84
|
+
expect(parseSkipExpression('["ns.key"]')).toBeNull();
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
|
|
88
|
+
describe("evaluateSkipExpression", () => {
|
|
89
|
+
it("returns false when there is no expression", async () => {
|
|
90
|
+
await expect(evaluateSkipExpression(null, storage({}))).resolves.toBe(
|
|
91
|
+
false
|
|
92
|
+
);
|
|
93
|
+
});
|
|
94
|
+
|
|
95
|
+
describe("exists", () => {
|
|
96
|
+
it("is true when the key holds a value", async () => {
|
|
97
|
+
await expect(
|
|
98
|
+
evaluate({ exists: "ns.key" }, { "ns.key": "value" })
|
|
99
|
+
).resolves.toBe(true);
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
it("is false when the key is absent", async () => {
|
|
103
|
+
await expect(evaluate({ exists: "ns.key" })).resolves.toBe(false);
|
|
104
|
+
});
|
|
105
|
+
|
|
106
|
+
it("is false when the key holds an empty string", async () => {
|
|
107
|
+
await expect(
|
|
108
|
+
evaluate({ exists: "ns.key" }, { "ns.key": "" })
|
|
109
|
+
).resolves.toBe(false);
|
|
110
|
+
});
|
|
111
|
+
|
|
112
|
+
it("splits the namespace on the last dot, like the legacy format", async () => {
|
|
113
|
+
const readKey = storage({ "com.applicaster.feature.someKey": "value" });
|
|
114
|
+
|
|
115
|
+
await evaluateSkipExpression(
|
|
116
|
+
{ exists: "com.applicaster.feature.someKey" },
|
|
117
|
+
readKey
|
|
118
|
+
);
|
|
119
|
+
|
|
120
|
+
expect(readKey).toHaveBeenCalledWith(
|
|
121
|
+
"someKey",
|
|
122
|
+
"com.applicaster.feature"
|
|
123
|
+
);
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
it("treats a bare string operand as a shorthand for exists", async () => {
|
|
127
|
+
await expect(
|
|
128
|
+
evaluateSkipExpression("ns.key", storage({ "ns.key": "value" }))
|
|
129
|
+
).resolves.toBe(true);
|
|
130
|
+
});
|
|
131
|
+
});
|
|
132
|
+
|
|
133
|
+
describe("missing", () => {
|
|
134
|
+
it("is true when the key is absent", async () => {
|
|
135
|
+
await expect(evaluate({ missing: "ns.key" })).resolves.toBe(true);
|
|
136
|
+
});
|
|
137
|
+
|
|
138
|
+
it("is false when the key holds a value", async () => {
|
|
139
|
+
await expect(
|
|
140
|
+
evaluate({ missing: "ns.key" }, { "ns.key": "value" })
|
|
141
|
+
).resolves.toBe(false);
|
|
142
|
+
});
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
describe("equals", () => {
|
|
146
|
+
it("is true when the stored value matches", async () => {
|
|
147
|
+
await expect(
|
|
148
|
+
evaluate(
|
|
149
|
+
{ equals: { key: "ns.key", value: "kids" } },
|
|
150
|
+
{ "ns.key": "kids" }
|
|
151
|
+
)
|
|
152
|
+
).resolves.toBe(true);
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
it("is false when the stored value differs", async () => {
|
|
156
|
+
await expect(
|
|
157
|
+
evaluate(
|
|
158
|
+
{ equals: { key: "ns.key", value: "kids" } },
|
|
159
|
+
{ "ns.key": "adults" }
|
|
160
|
+
)
|
|
161
|
+
).resolves.toBe(false);
|
|
162
|
+
});
|
|
163
|
+
|
|
164
|
+
it("compares a non-string stored value by its string form", async () => {
|
|
165
|
+
await expect(
|
|
166
|
+
evaluate({ equals: { key: "ns.key", value: "42" } }, { "ns.key": 42 })
|
|
167
|
+
).resolves.toBe(true);
|
|
168
|
+
});
|
|
169
|
+
});
|
|
170
|
+
|
|
171
|
+
describe("all", () => {
|
|
172
|
+
it("is true only when every operand is true", async () => {
|
|
173
|
+
await expect(
|
|
174
|
+
evaluate({ all: ["ns.a", "ns.b"] }, { "ns.a": "1", "ns.b": "2" })
|
|
175
|
+
).resolves.toBe(true);
|
|
176
|
+
});
|
|
177
|
+
|
|
178
|
+
it("is false when one operand is false", async () => {
|
|
179
|
+
await expect(
|
|
180
|
+
evaluate({ all: ["ns.a", "ns.b"] }, { "ns.a": "1" })
|
|
181
|
+
).resolves.toBe(false);
|
|
182
|
+
});
|
|
183
|
+
|
|
184
|
+
it("stops reading storage after the first false operand", async () => {
|
|
185
|
+
const readKey = storage({ "ns.b": "2" });
|
|
186
|
+
|
|
187
|
+
await evaluateSkipExpression({ all: ["ns.a", "ns.b"] }, readKey);
|
|
188
|
+
|
|
189
|
+
expect(readKey).toHaveBeenCalledTimes(1);
|
|
190
|
+
});
|
|
191
|
+
|
|
192
|
+
it("is false for an empty operand list", async () => {
|
|
193
|
+
await expect(evaluate({ all: [] })).resolves.toBe(false);
|
|
194
|
+
});
|
|
195
|
+
});
|
|
196
|
+
|
|
197
|
+
describe("any", () => {
|
|
198
|
+
it("is true when one operand is true", async () => {
|
|
199
|
+
await expect(
|
|
200
|
+
evaluate({ any: ["ns.a", "ns.b"] }, { "ns.b": "2" })
|
|
201
|
+
).resolves.toBe(true);
|
|
202
|
+
});
|
|
203
|
+
|
|
204
|
+
it("is false when every operand is false", async () => {
|
|
205
|
+
await expect(evaluate({ any: ["ns.a", "ns.b"] })).resolves.toBe(false);
|
|
206
|
+
});
|
|
207
|
+
|
|
208
|
+
it("stops reading storage after the first true operand", async () => {
|
|
209
|
+
const readKey = storage({ "ns.a": "1", "ns.b": "2" });
|
|
210
|
+
|
|
211
|
+
await evaluateSkipExpression({ any: ["ns.a", "ns.b"] }, readKey);
|
|
212
|
+
|
|
213
|
+
expect(readKey).toHaveBeenCalledTimes(1);
|
|
214
|
+
});
|
|
215
|
+
|
|
216
|
+
it("is false for an empty operand list", async () => {
|
|
217
|
+
await expect(evaluate({ any: [] })).resolves.toBe(false);
|
|
218
|
+
});
|
|
219
|
+
});
|
|
220
|
+
|
|
221
|
+
describe("not", () => {
|
|
222
|
+
it("inverts a true operand", async () => {
|
|
223
|
+
await expect(
|
|
224
|
+
evaluate({ not: "ns.key" }, { "ns.key": "value" })
|
|
225
|
+
).resolves.toBe(false);
|
|
226
|
+
});
|
|
227
|
+
|
|
228
|
+
it("inverts a false operand", async () => {
|
|
229
|
+
await expect(evaluate({ not: "ns.key" })).resolves.toBe(true);
|
|
230
|
+
});
|
|
231
|
+
});
|
|
232
|
+
|
|
233
|
+
describe("malformed expressions fail open", () => {
|
|
234
|
+
it("is false for an unknown operator", async () => {
|
|
235
|
+
await expect(evaluate({ matches: "ns.key" })).resolves.toBe(false);
|
|
236
|
+
});
|
|
237
|
+
|
|
238
|
+
it("is false for an operator carrying the wrong operand type", async () => {
|
|
239
|
+
await expect(evaluate({ exists: 42 })).resolves.toBe(false);
|
|
240
|
+
await expect(evaluate({ all: "ns.key" })).resolves.toBe(false);
|
|
241
|
+
});
|
|
242
|
+
|
|
243
|
+
it("is false for an operand list holding a malformed node", async () => {
|
|
244
|
+
await expect(
|
|
245
|
+
evaluate({ all: ["ns.a", { matches: "ns.b" }] }, { "ns.a": "1" })
|
|
246
|
+
).resolves.toBe(false);
|
|
247
|
+
});
|
|
248
|
+
|
|
249
|
+
it("is false when a storage read throws", async () => {
|
|
250
|
+
const readKey = jest.fn(() => Promise.reject(new Error("storage error")));
|
|
251
|
+
|
|
252
|
+
await expect(
|
|
253
|
+
evaluateSkipExpression({ exists: "ns.key" }, readKey)
|
|
254
|
+
).resolves.toBe(false);
|
|
255
|
+
});
|
|
256
|
+
|
|
257
|
+
it("keeps evaluating the other operands when one storage read throws", async () => {
|
|
258
|
+
const readKey = jest.fn((key: string) =>
|
|
259
|
+
key === "a"
|
|
260
|
+
? Promise.reject(new Error("storage error"))
|
|
261
|
+
: Promise.resolve("value")
|
|
262
|
+
);
|
|
263
|
+
|
|
264
|
+
await expect(
|
|
265
|
+
evaluateSkipExpression({ any: ["ns.a", "ns.b"] }, readKey)
|
|
266
|
+
).resolves.toBe(true);
|
|
267
|
+
});
|
|
268
|
+
});
|
|
269
|
+
|
|
270
|
+
describe("profile selector scenario", () => {
|
|
271
|
+
const skipProfileSelector = {
|
|
272
|
+
any: [{ missing: TOKEN }, { exists: PROFILE }],
|
|
273
|
+
};
|
|
274
|
+
|
|
275
|
+
it("shows the hook to a logged-in user who has not picked a profile yet", async () => {
|
|
276
|
+
await expect(
|
|
277
|
+
evaluate(skipProfileSelector, { [TOKEN]: "a-token" })
|
|
278
|
+
).resolves.toBe(false);
|
|
279
|
+
});
|
|
280
|
+
|
|
281
|
+
it("skips the hook for a logged-out user", async () => {
|
|
282
|
+
await expect(evaluate(skipProfileSelector)).resolves.toBe(true);
|
|
283
|
+
});
|
|
284
|
+
|
|
285
|
+
it("skips the hook once a profile has been picked", async () => {
|
|
286
|
+
await expect(
|
|
287
|
+
evaluate(skipProfileSelector, {
|
|
288
|
+
[TOKEN]: "a-token",
|
|
289
|
+
[PROFILE]: "profile-id",
|
|
290
|
+
})
|
|
291
|
+
).resolves.toBe(true);
|
|
292
|
+
});
|
|
293
|
+
});
|
|
294
|
+
});
|
|
@@ -0,0 +1,188 @@
|
|
|
1
|
+
import {
|
|
2
|
+
parseKeyEntries,
|
|
3
|
+
getKeyToSkipHook,
|
|
4
|
+
shouldSkipHook,
|
|
5
|
+
} from "../validationHelper";
|
|
6
|
+
|
|
7
|
+
const mockSessionGetItem = jest.fn();
|
|
8
|
+
const mockLocalGetItem = jest.fn();
|
|
9
|
+
|
|
10
|
+
jest.mock(
|
|
11
|
+
"@applicaster/zapp-react-native-bridge/ZappStorage/SessionStorage",
|
|
12
|
+
() => ({
|
|
13
|
+
sessionStorage: { getItem: (...args) => mockSessionGetItem(...args) },
|
|
14
|
+
})
|
|
15
|
+
);
|
|
16
|
+
|
|
17
|
+
jest.mock(
|
|
18
|
+
"@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage",
|
|
19
|
+
() => ({
|
|
20
|
+
localStorage: { getItem: (...args) => mockLocalGetItem(...args) },
|
|
21
|
+
})
|
|
22
|
+
);
|
|
23
|
+
|
|
24
|
+
jest.mock("../logger", () => ({
|
|
25
|
+
log_debug: jest.fn(),
|
|
26
|
+
log_error: jest.fn(),
|
|
27
|
+
log_info: jest.fn(),
|
|
28
|
+
}));
|
|
29
|
+
|
|
30
|
+
describe("parseKeyEntries", () => {
|
|
31
|
+
it("parses a namespaced key as namespace.key", () => {
|
|
32
|
+
expect(parseKeyEntries("myNamespace.myKey")).toEqual([
|
|
33
|
+
{ namespace: "myNamespace", key: "myKey" },
|
|
34
|
+
]);
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
it("treats everything before the last dot as the namespace", () => {
|
|
38
|
+
expect(parseKeyEntries("com.applicaster.feature.someKey")).toEqual([
|
|
39
|
+
{ namespace: "com.applicaster.feature", key: "someKey" },
|
|
40
|
+
]);
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
it("falls back to the default namespace when there is no dot", () => {
|
|
44
|
+
expect(parseKeyEntries("plainKey")).toEqual([
|
|
45
|
+
{ namespace: "applicaster.v2", key: "plainKey" },
|
|
46
|
+
]);
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
it("splits comma-separated entries, trimming whitespace and empty items", () => {
|
|
50
|
+
expect(parseKeyEntries(" ns1.key1 , , ns2.key2 ,")).toEqual([
|
|
51
|
+
{ namespace: "ns1", key: "key1" },
|
|
52
|
+
{ namespace: "ns2", key: "key2" },
|
|
53
|
+
]);
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
describe("getKeyToSkipHook", () => {
|
|
58
|
+
beforeEach(() => {
|
|
59
|
+
jest.clearAllMocks();
|
|
60
|
+
});
|
|
61
|
+
|
|
62
|
+
it("returns the session storage value when present, without hitting local storage", async () => {
|
|
63
|
+
mockSessionGetItem.mockResolvedValue("session-value");
|
|
64
|
+
|
|
65
|
+
const value = await getKeyToSkipHook("myKey", "myNamespace");
|
|
66
|
+
|
|
67
|
+
expect(value).toBe("session-value");
|
|
68
|
+
expect(mockSessionGetItem).toHaveBeenCalledWith("myKey", "myNamespace");
|
|
69
|
+
expect(mockLocalGetItem).not.toHaveBeenCalled();
|
|
70
|
+
});
|
|
71
|
+
|
|
72
|
+
it("falls back to local storage when session storage is empty", async () => {
|
|
73
|
+
mockSessionGetItem.mockResolvedValue(null);
|
|
74
|
+
mockLocalGetItem.mockResolvedValue("local-value");
|
|
75
|
+
|
|
76
|
+
const value = await getKeyToSkipHook("myKey", "myNamespace");
|
|
77
|
+
|
|
78
|
+
expect(value).toBe("local-value");
|
|
79
|
+
expect(mockLocalGetItem).toHaveBeenCalledWith("myKey", "myNamespace");
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
|
|
83
|
+
describe("shouldSkipHook", () => {
|
|
84
|
+
beforeEach(() => {
|
|
85
|
+
jest.clearAllMocks();
|
|
86
|
+
mockSessionGetItem.mockResolvedValue(null);
|
|
87
|
+
mockLocalGetItem.mockResolvedValue(null);
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
it("returns false when no condition is provided", async () => {
|
|
91
|
+
await expect(shouldSkipHook(undefined)).resolves.toBe(false);
|
|
92
|
+
await expect(shouldSkipHook("")).resolves.toBe(false);
|
|
93
|
+
await expect(shouldSkipHook(" ")).resolves.toBe(false);
|
|
94
|
+
});
|
|
95
|
+
|
|
96
|
+
it("returns true when a key is found in storage, querying with parsed namespace and key", async () => {
|
|
97
|
+
mockSessionGetItem.mockResolvedValue("value");
|
|
98
|
+
|
|
99
|
+
await expect(shouldSkipHook("myNamespace.myKey")).resolves.toBe(true);
|
|
100
|
+
expect(mockSessionGetItem).toHaveBeenCalledWith("myKey", "myNamespace");
|
|
101
|
+
});
|
|
102
|
+
|
|
103
|
+
it("returns true when any of the comma-separated keys is found", async () => {
|
|
104
|
+
mockLocalGetItem.mockImplementation((key) =>
|
|
105
|
+
Promise.resolve(key === "key2" ? "value" : null)
|
|
106
|
+
);
|
|
107
|
+
|
|
108
|
+
await expect(shouldSkipHook("ns1.key1, ns2.key2")).resolves.toBe(true);
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
it("returns false when none of the keys are found", async () => {
|
|
112
|
+
await expect(shouldSkipHook("ns1.key1, ns2.key2")).resolves.toBe(false);
|
|
113
|
+
expect(mockSessionGetItem).toHaveBeenCalledTimes(2);
|
|
114
|
+
expect(mockLocalGetItem).toHaveBeenCalledTimes(2);
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
it("continues to the next key when a storage read throws", async () => {
|
|
118
|
+
mockSessionGetItem
|
|
119
|
+
.mockRejectedValueOnce(new Error("storage error"))
|
|
120
|
+
.mockResolvedValueOnce("value");
|
|
121
|
+
|
|
122
|
+
await expect(shouldSkipHook("ns1.key1, ns2.key2")).resolves.toBe(true);
|
|
123
|
+
});
|
|
124
|
+
});
|
|
125
|
+
|
|
126
|
+
describe("shouldSkipHook with a packed expression", () => {
|
|
127
|
+
const SKIP_UNLESS_LOGGED_IN_WITHOUT_PROFILE = JSON.stringify({
|
|
128
|
+
any: [
|
|
129
|
+
{ missing: "quick-brick-login-flow.access_token" },
|
|
130
|
+
{ exists: "user_account.profile" },
|
|
131
|
+
],
|
|
132
|
+
});
|
|
133
|
+
|
|
134
|
+
const storedKeys = (store: Record<string, string>) => {
|
|
135
|
+
mockSessionGetItem.mockImplementation((key, namespace) =>
|
|
136
|
+
Promise.resolve(store[`${namespace}.${key}`] ?? null)
|
|
137
|
+
);
|
|
138
|
+
|
|
139
|
+
mockLocalGetItem.mockResolvedValue(null);
|
|
140
|
+
};
|
|
141
|
+
|
|
142
|
+
beforeEach(() => {
|
|
143
|
+
jest.clearAllMocks();
|
|
144
|
+
storedKeys({});
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
it("does not skip for a logged-in user who has not picked a profile yet", async () => {
|
|
148
|
+
storedKeys({ "quick-brick-login-flow.access_token": "a-token" });
|
|
149
|
+
|
|
150
|
+
await expect(
|
|
151
|
+
shouldSkipHook(SKIP_UNLESS_LOGGED_IN_WITHOUT_PROFILE)
|
|
152
|
+
).resolves.toBe(false);
|
|
153
|
+
});
|
|
154
|
+
|
|
155
|
+
it("skips for a logged-out user", async () => {
|
|
156
|
+
await expect(
|
|
157
|
+
shouldSkipHook(SKIP_UNLESS_LOGGED_IN_WITHOUT_PROFILE)
|
|
158
|
+
).resolves.toBe(true);
|
|
159
|
+
});
|
|
160
|
+
|
|
161
|
+
it("skips once a profile has been picked", async () => {
|
|
162
|
+
storedKeys({
|
|
163
|
+
"quick-brick-login-flow.access_token": "a-token",
|
|
164
|
+
"user_account.profile": "profile-id",
|
|
165
|
+
});
|
|
166
|
+
|
|
167
|
+
await expect(
|
|
168
|
+
shouldSkipHook(SKIP_UNLESS_LOGGED_IN_WITHOUT_PROFILE)
|
|
169
|
+
).resolves.toBe(true);
|
|
170
|
+
});
|
|
171
|
+
|
|
172
|
+
it("falls back to local storage for a key the session does not hold", async () => {
|
|
173
|
+
mockLocalGetItem.mockResolvedValue("a-token");
|
|
174
|
+
|
|
175
|
+
await expect(
|
|
176
|
+
shouldSkipHook(JSON.stringify({ exists: "ns.key" }))
|
|
177
|
+
).resolves.toBe(true);
|
|
178
|
+
|
|
179
|
+
expect(mockSessionGetItem).toHaveBeenCalledWith("key", "ns");
|
|
180
|
+
expect(mockLocalGetItem).toHaveBeenCalledWith("key", "ns");
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
it("returns false for a malformed expression instead of reading storage", async () => {
|
|
184
|
+
await expect(shouldSkipHook('{"any":')).resolves.toBe(false);
|
|
185
|
+
expect(mockSessionGetItem).not.toHaveBeenCalled();
|
|
186
|
+
expect(mockLocalGetItem).not.toHaveBeenCalled();
|
|
187
|
+
});
|
|
188
|
+
});
|
|
@@ -0,0 +1,53 @@
|
|
|
1
|
+
import {
|
|
2
|
+
PipesClientResponseHelper,
|
|
3
|
+
RequestBuilder,
|
|
4
|
+
} from "@applicaster/zapp-pipes-v2-client";
|
|
5
|
+
import { log_debug, log_error } from "./logger";
|
|
6
|
+
|
|
7
|
+
export const requestToSkipHook = async (
|
|
8
|
+
dataSource: ZappDataSource,
|
|
9
|
+
payload: ZappEntry
|
|
10
|
+
): Promise<boolean> => {
|
|
11
|
+
try {
|
|
12
|
+
const requestBuilder = new RequestBuilder()
|
|
13
|
+
.setEntryContext(payload)
|
|
14
|
+
// @ts-ignore: empty screen context is acceptable for this request
|
|
15
|
+
.setScreenContext({})
|
|
16
|
+
.setUrl(dataSource.source, dataSource.mapping);
|
|
17
|
+
|
|
18
|
+
const request = await requestBuilder.buildAxiosRequest();
|
|
19
|
+
|
|
20
|
+
log_debug(
|
|
21
|
+
`requestToSkipHook: Request built for source: ${
|
|
22
|
+
request?.url || dataSource.source
|
|
23
|
+
}`,
|
|
24
|
+
{ ...request, source: dataSource.source }
|
|
25
|
+
);
|
|
26
|
+
|
|
27
|
+
const responseObject = await requestBuilder.call<boolean>();
|
|
28
|
+
const responseHelper = new PipesClientResponseHelper(responseObject);
|
|
29
|
+
|
|
30
|
+
const error = responseHelper.error;
|
|
31
|
+
const logData = responseHelper.getLogsData();
|
|
32
|
+
|
|
33
|
+
if (error) {
|
|
34
|
+
log_error(`requestToSkipHook: Error: ${error.message}`, {
|
|
35
|
+
response: logData,
|
|
36
|
+
});
|
|
37
|
+
|
|
38
|
+
throw error;
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
log_debug(
|
|
42
|
+
`requestToSkipHook: Request received successfully. Status: ${responseHelper.statusCode}`,
|
|
43
|
+
{ response: logData }
|
|
44
|
+
);
|
|
45
|
+
|
|
46
|
+
// Non-empty body = skip the hook (same contract as hook-screen-wrapper)
|
|
47
|
+
return Boolean(responseHelper.responseData);
|
|
48
|
+
} catch (error) {
|
|
49
|
+
log_error(`requestToSkipHook: Error: ${error.message}`, { error });
|
|
50
|
+
|
|
51
|
+
throw error;
|
|
52
|
+
}
|
|
53
|
+
};
|