@applicaster/zapp-react-native-utils 16.0.0-rc.9 → 16.0.0-rc.91
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/actionsExecutor/ActionExecutor.ts +57 -12
- package/actionsExecutor/ActionExecutorContext.tsx +113 -314
- package/actionsExecutor/__tests__/ActionExecutor.test.ts +71 -0
- package/actionsExecutor/__tests__/feedDecorator.test.ts +61 -0
- package/actionsExecutor/actions/__tests__/dismissBottomSheet.test.ts +25 -0
- package/actionsExecutor/actions/__tests__/goBack.test.ts +62 -0
- package/actionsExecutor/actions/__tests__/goHome.test.ts +19 -0
- package/actionsExecutor/actions/__tests__/loadItemsFromSource.test.ts +88 -0
- package/actionsExecutor/actions/__tests__/navigateToScreen.test.ts +133 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.customContent.test.ts +76 -0
- package/actionsExecutor/actions/__tests__/openBottomSheet.inlineItems.test.ts +212 -0
- package/actionsExecutor/actions/__tests__/presentScreen.test.ts +127 -0
- package/actionsExecutor/actions/__tests__/showAlert.test.ts +49 -0
- package/actionsExecutor/actions/__tests__/showToast.test.ts +88 -0
- package/actionsExecutor/actions/appRestart.ts +24 -0
- package/actionsExecutor/actions/confirmDialog.ts +53 -0
- package/actionsExecutor/actions/dismissBottomSheet.ts +23 -0
- package/actionsExecutor/actions/goBack.ts +60 -0
- package/actionsExecutor/actions/goHome.ts +31 -0
- package/actionsExecutor/actions/index.ts +42 -0
- package/actionsExecutor/actions/localStorageRemove.ts +27 -0
- package/actionsExecutor/actions/localStorageSet.ts +28 -0
- package/actionsExecutor/actions/localStorageToggleFlag.ts +28 -0
- package/actionsExecutor/actions/navigateToScreen.ts +137 -0
- package/actionsExecutor/actions/openBottomSheet.ts +329 -0
- package/actionsExecutor/actions/presentScreen.ts +78 -0
- package/actionsExecutor/actions/refreshComponent.ts +85 -0
- package/actionsExecutor/actions/screenSetVariable.ts +35 -0
- package/actionsExecutor/actions/screenToggleFlag.ts +38 -0
- package/actionsExecutor/actions/sendCloudEvent.ts +93 -0
- package/actionsExecutor/actions/sessionStorageRemove.ts +19 -0
- package/actionsExecutor/actions/sessionStorageSet.ts +20 -0
- package/actionsExecutor/actions/sessionStorageToggleFlag.ts +15 -0
- package/actionsExecutor/actions/showAlert.ts +51 -0
- package/actionsExecutor/actions/showToast.ts +87 -0
- package/actionsExecutor/actions/switchLayout.ts +40 -0
- package/actionsExecutor/consts.ts +27 -0
- package/actionsExecutor/feedDecorator.ts +6 -6
- package/actionsExecutor/types.ts +59 -0
- package/analyticsUtils/AnalyticsEvents/sendMenuClickEvent.ts +2 -2
- package/analyticsUtils/PlayerAnalyticsManager.ts +12 -2
- package/analyticsUtils/__tests__/analyticsMapper.test.ts +35 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testACP_events.json +1 -1
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testBlockUnlistedParams_rules.json +1 -1
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testEmptyRenameKeepsName_events.json +4 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testEmptyRenameKeepsName_rules.json +6 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testEventRegex_events.json +3 -9
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testIgnoreOrdering_events.json +18 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testIgnoreOrdering_rules.json +16 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexEventNoFallback_events.json +4 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexEventNoFallback_rules.json +6 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexMultiGroupRename_events.json +4 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexMultiGroupRename_rules.json +6 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexNonNamedFullMatch_events.json +4 -0
- package/analyticsUtils/__tests__/fixtures/analytics_mapper_testRegexNonNamedFullMatch_rules.json +6 -0
- package/analyticsUtils/__tests__/fixtures/index.js +20 -0
- package/analyticsUtils/analyticsMapper.ts +4 -1
- package/analyticsUtils/playerAnalyticsTracker.ts +26 -3
- package/appUtils/HooksManager/index.ts +12 -8
- package/appUtils/contextKeysManager/__tests__/getKey/failure.test.ts +1 -1
- package/appUtils/contextKeysManager/__tests__/removeKey/failure.test.ts +1 -1
- package/appUtils/contextKeysManager/__tests__/setKey/failure/invalidKey.test.ts +4 -4
- package/appUtils/contextKeysManager/index.ts +1 -1
- package/appUtils/contextKeysManager/utils/index.ts +38 -25
- package/appUtils/playerManager/OverlayObserver/OverlaysObserver.ts +143 -53
- package/appUtils/playerManager/OverlayObserver/__tests__/liveContent.test.ts +205 -0
- package/appUtils/playerManager/OverlayObserver/__tests__/utils.test.ts +49 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.android.tv.ts +4 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.ios.tv.ts +4 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.ts +11 -0
- package/appUtils/playerManager/OverlayObserver/getUpcomingQueue.web.ts +4 -0
- package/appUtils/playerManager/OverlayObserver/utils.ts +54 -20
- package/appUtils/playerManager/__tests__/playerContent.test.ts +403 -0
- package/appUtils/playerManager/__tests__/playerFactory.test.ts +1 -1
- package/appUtils/playerManager/__tests__/playerNative.test.ts +38 -0
- package/appUtils/playerManager/__tests__/usePlayerContent.test.tsx +64 -0
- package/appUtils/playerManager/{conts.ts → const.ts} +20 -0
- package/appUtils/playerManager/index.ts +1 -1
- package/appUtils/playerManager/player.ts +115 -3
- package/appUtils/playerManager/playerFactory.ts +1 -1
- package/appUtils/playerManager/playerNative.ts +6 -4
- package/appUtils/playerManager/usePlayerContent.tsx +43 -0
- package/appUtils/playerManager/usePlayerControllerSetup.tsx +1 -1
- package/appUtils/playerManager/userLanguagePreference.ts +1 -1
- package/arrayUtils/__tests__/{anyThruthy.test.ts → anyTruthy.test.ts} +8 -0
- package/arrayUtils/__tests__/arrayUtils.test.ts +165 -108
- package/arrayUtils/__tests__/isEmptyArray.test.ts +11 -0
- package/arrayUtils/__tests__/isFilledArray.test.ts +12 -0
- package/arrayUtils/__tests__/isFirst.test.ts +17 -0
- package/arrayUtils/__tests__/isIndexInRange.test.ts +14 -0
- package/arrayUtils/__tests__/isLast.test.ts +31 -0
- package/arrayUtils/__tests__/makeListOf.test.ts +31 -0
- package/arrayUtils/__tests__/makeListOfIndexes.test.ts +20 -0
- package/arrayUtils/__tests__/reorderByIds.test.ts +50 -0
- package/arrayUtils/__tests__/sample.test.ts +61 -0
- package/arrayUtils/index.ts +136 -20
- package/bottomSheet/__tests__/scrollContext.test.tsx +35 -0
- package/bottomSheet/index.ts +17 -0
- package/cellUtils/index.ts +33 -8
- package/colorUtils/__tests__/isTransparentColor.test.ts +76 -0
- package/colorUtils/__tests__/isValidColor.test.ts +70 -0
- package/colorUtils/index.ts +50 -0
- package/configurationUtils/__tests__/manifestKeyParser.test.ts +21 -0
- package/configurationUtils/__tests__/modalBlocksParser.test.ts +208 -0
- package/configurationUtils/manifestKeyParser.ts +50 -10
- package/configurationUtils/modalBlocksParser.ts +200 -0
- package/entryActions/__tests__/buildEntryActions.test.ts +235 -0
- package/entryActions/aliasPresentation.ts +108 -0
- package/entryActions/buildEntryActions.ts +167 -0
- package/entryActions/index.ts +15 -0
- package/entryActions/types.ts +39 -0
- package/manifestUtils/__tests__/player.audioControls.test.js +158 -0
- package/manifestUtils/_internals/index.js +14 -3
- package/manifestUtils/defaultManifestConfigurations/generalContent.js +41 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +349 -20
- package/manifestUtils/fieldUtils/__tests__/fieldUtils.test.js +84 -0
- package/manifestUtils/fieldUtils/index.js +125 -0
- package/manifestUtils/index.js +3 -0
- package/manifestUtils/keys.js +9 -0
- package/manifestUtils/mobileAction/button/index.js +16 -0
- package/manifestUtils/mobileAction/container/index.js +3 -1
- package/manifestUtils/mobileAction/groups/defaults.js +3 -1
- package/manifestUtils/modalBlocks.js +304 -0
- package/manifestUtils/platformIsTV.js +1 -0
- package/modalState/ContentViewModel.ts +113 -0
- package/modalState/EditableCollection.ts +17 -0
- package/modalState/EditableCollectionRegistry.ts +51 -0
- package/modalState/ModalOrchestrator.ts +211 -0
- package/modalState/RemoteEditableCollection.ts +235 -0
- package/modalState/__tests__/ContentViewModel.editable.test.ts +69 -0
- package/modalState/__tests__/ContentViewModel.test.ts +165 -0
- package/modalState/__tests__/EditableCollectionRegistry.test.ts +112 -0
- package/modalState/__tests__/ModalOrchestrator.phase3.test.ts +47 -0
- package/modalState/__tests__/RemoteEditableCollection.test.ts +415 -0
- package/modalState/__tests__/index.test.ts +30 -1
- package/modalState/__tests__/useBottomSheetContent.test.ts +349 -0
- package/modalState/__tests__/useModalStoreState.test.ts +142 -0
- package/modalState/index.ts +35 -83
- package/modalState/store.ts +109 -0
- package/modalState/types.ts +160 -0
- package/modalState/useBottomSheetContent.ts +109 -0
- package/numberUtils/__tests__/isMinusZero.test.ts +20 -0
- package/numberUtils/__tests__/isZero.test.ts +27 -0
- package/numberUtils/__tests__/requireNumber.test.ts +50 -0
- package/numberUtils/__tests__/toNumber.test.ts +27 -0
- package/numberUtils/__tests__/toNumberWithDefault.test.ts +64 -0
- package/numberUtils/__tests__/toNumberWithDefaultZero.test.ts +48 -0
- package/numberUtils/index.ts +27 -8
- package/package.json +2 -2
- package/pipesUtils/__tests__/buildUrlWithQuery.test.ts +33 -0
- package/pipesUtils/__tests__/withPipesEndpoint.test.tsx +56 -0
- package/pipesUtils/index.ts +1 -0
- package/pipesUtils/withPipesEndpoint.tsx +54 -0
- package/playerUtils/__tests__/contentDataKeys.test.ts +297 -0
- package/playerUtils/__tests__/resolvePlayerActions.test.ts +138 -0
- package/playerUtils/__tests__/resolvePlayerTitleSubtitle.test.ts +180 -0
- package/playerUtils/contentDataKeys.ts +134 -0
- package/playerUtils/index.ts +41 -18
- package/playerUtils/isAudioItem.ts +26 -0
- package/playerUtils/resolvePlayerActions.ts +71 -0
- package/playerUtils/resolvePlayerTitleSubtitle.ts +76 -0
- package/reactHooks/actions/index.ts +117 -2
- package/reactHooks/cell-click/__tests__/index.test.js +64 -0
- package/reactHooks/cell-click/index.ts +39 -24
- package/reactHooks/feed/__mocks__/useMarkPipesDataStale.ts +4 -0
- package/reactHooks/feed/__tests__/useInflatedUrl.test.tsx +25 -0
- package/reactHooks/feed/index.ts +5 -1
- package/reactHooks/feed/useBatchLoading.ts +9 -1
- package/reactHooks/feed/{usePipesCacheReset.ts → useMarkPipesDataStale.ts} +12 -4
- package/reactHooks/index.ts +2 -0
- package/reactHooks/layout/index.ts +1 -1
- package/reactHooks/navigation/__mocks__/index.ts +4 -0
- package/reactHooks/navigation/__tests__/index.test.tsx +176 -1
- package/reactHooks/navigation/__tests__/useIsScreenActive.test.ts +42 -0
- package/reactHooks/navigation/__tests__/usePresentScreen.test.ts +154 -0
- package/reactHooks/navigation/index.ts +3 -1
- package/reactHooks/navigation/useIsScreenActive.ts +29 -8
- package/reactHooks/navigation/usePresentScreen.ts +157 -0
- package/reactHooks/navigation/useRoute.ts +22 -5
- package/reactHooks/state/useComponentScreenState.ts +1 -1
- package/reactHooks/usePluginConfiguration.ts +4 -1
- package/reactHooks/utils/__tests__/index.test.js +22 -2
- package/reactHooks/utils/index.ts +13 -2
- package/reactHooks/videoModal/hooks/useVideoModalScreenData.tsx +22 -4
- package/riverComponetsMeasurementProvider/index.tsx +12 -8
- package/stringUtils/__tests__/stringUtils.test.js +42 -0
- package/stringUtils/index.ts +2 -2
- package/uiActionsRegistrator/__tests__/resolveActionIdentifiers.test.ts +93 -0
- package/uiActionsRegistrator/__tests__/subscribe.test.ts +107 -0
- package/uiActionsRegistrator/__tests__/usableActionItems.test.ts +52 -0
- package/uiActionsRegistrator/index.ts +25 -0
- package/uiActionsRegistrator/registry.ts +335 -0
- package/uiActionsRegistrator/resolveActionIdentifiers.ts +100 -0
- package/uiActionsRegistrator/usableActionItems.ts +66 -0
- package/zappFrameworkUtils/__tests__/localStorageHelper.test.ts +146 -0
- package/zappFrameworkUtils/localStorageHelper.ts +19 -15
- package/appUtils/playerManager/usePlayerTitleSummaryOverlay.tsx +0 -56
- package/playerUtils/__tests__/getPlayerActionButtons.test.ts +0 -54
- package/playerUtils/getPlayerActionButtons.ts +0 -17
- package/reactHooks/feed/__mocks__/usePipesCacheReset.ts +0 -1
- /package/reactHooks/actions/__tests__/{index.test.js → index.test.tsx} +0 -0
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@applicaster/zapp-react-native-utils",
|
|
3
|
-
"version": "16.0.0-rc.
|
|
3
|
+
"version": "16.0.0-rc.91",
|
|
4
4
|
"description": "Applicaster Zapp React Native utilities package",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"types": "index.d.ts",
|
|
@@ -27,7 +27,7 @@
|
|
|
27
27
|
},
|
|
28
28
|
"homepage": "https://github.com/applicaster/quickbrick#readme",
|
|
29
29
|
"dependencies": {
|
|
30
|
-
"@applicaster/applicaster-types": "16.0.0-rc.
|
|
30
|
+
"@applicaster/applicaster-types": "16.0.0-rc.91",
|
|
31
31
|
"buffer": "^5.2.1",
|
|
32
32
|
"camelize": "^1.0.0",
|
|
33
33
|
"dayjs": "^1.11.10",
|
|
@@ -0,0 +1,33 @@
|
|
|
1
|
+
import { buildUrlWithQuery } from "../withPipesEndpoint";
|
|
2
|
+
|
|
3
|
+
describe("buildUrlWithQuery", () => {
|
|
4
|
+
it("returns the url unchanged when requestParams is null", () => {
|
|
5
|
+
expect(buildUrlWithQuery("https://foo.com/path", null)).toBe(
|
|
6
|
+
"https://foo.com/path"
|
|
7
|
+
);
|
|
8
|
+
});
|
|
9
|
+
|
|
10
|
+
it("returns the url unchanged when requestParams has no params", () => {
|
|
11
|
+
expect(buildUrlWithQuery("https://foo.com/path", { headers: {} })).toBe(
|
|
12
|
+
"https://foo.com/path"
|
|
13
|
+
);
|
|
14
|
+
});
|
|
15
|
+
|
|
16
|
+
it("returns the url unchanged when url is empty", () => {
|
|
17
|
+
expect(buildUrlWithQuery("", { params: { a: "1" } })).toBe("");
|
|
18
|
+
});
|
|
19
|
+
|
|
20
|
+
it("appends params to a url with no existing query", () => {
|
|
21
|
+
expect(
|
|
22
|
+
buildUrlWithQuery("https://foo.com/path", { params: { token: "abc" } })
|
|
23
|
+
).toBe("https://foo.com/path?token=abc");
|
|
24
|
+
});
|
|
25
|
+
|
|
26
|
+
it("merges params with an existing query string", () => {
|
|
27
|
+
expect(
|
|
28
|
+
buildUrlWithQuery("https://foo.com/path?existing=1", {
|
|
29
|
+
params: { token: "abc" },
|
|
30
|
+
})
|
|
31
|
+
).toBe("https://foo.com/path?existing=1&token=abc");
|
|
32
|
+
});
|
|
33
|
+
});
|
|
@@ -0,0 +1,56 @@
|
|
|
1
|
+
import * as React from "react";
|
|
2
|
+
import { render } from "@testing-library/react-native";
|
|
3
|
+
import { Text } from "react-native";
|
|
4
|
+
|
|
5
|
+
const mockedUseBuildPipesUrl = jest.fn();
|
|
6
|
+
|
|
7
|
+
jest.mock("@applicaster/zapp-react-native-utils/reactHooks/feed", () => ({
|
|
8
|
+
useBuildPipesUrl: (args) => mockedUseBuildPipesUrl(args),
|
|
9
|
+
}));
|
|
10
|
+
|
|
11
|
+
const { withPipesEndpoint } = require("../withPipesEndpoint");
|
|
12
|
+
|
|
13
|
+
// eslint-disable-next-line react/display-name
|
|
14
|
+
const Wrapped = React.forwardRef((props: any, _ref) => (
|
|
15
|
+
<Text testID="wrapped">{`${props.uri}|${JSON.stringify(props.headers)}`}</Text>
|
|
16
|
+
));
|
|
17
|
+
|
|
18
|
+
describe("withPipesEndpoint", () => {
|
|
19
|
+
afterEach(() => jest.clearAllMocks());
|
|
20
|
+
|
|
21
|
+
it("renders nothing while the endpoint context is resolving", () => {
|
|
22
|
+
mockedUseBuildPipesUrl.mockReturnValue({ requestParams: null });
|
|
23
|
+
|
|
24
|
+
const Decorated = withPipesEndpoint(Wrapped);
|
|
25
|
+
const { queryByTestId } = render(<Decorated uri="https://foo.com" />);
|
|
26
|
+
|
|
27
|
+
expect(queryByTestId("wrapped")).toBeNull();
|
|
28
|
+
});
|
|
29
|
+
|
|
30
|
+
it("passes the uri through unchanged when there are no params", () => {
|
|
31
|
+
mockedUseBuildPipesUrl.mockReturnValue({ requestParams: {} });
|
|
32
|
+
|
|
33
|
+
const Decorated = withPipesEndpoint(Wrapped);
|
|
34
|
+
const { getByTestId } = render(<Decorated uri="https://foo.com/path" />);
|
|
35
|
+
|
|
36
|
+
expect(getByTestId("wrapped").props.children).toBe(
|
|
37
|
+
"https://foo.com/path|{}"
|
|
38
|
+
);
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
it("merges resolved params into the uri and forwards headers", () => {
|
|
42
|
+
mockedUseBuildPipesUrl.mockReturnValue({
|
|
43
|
+
requestParams: {
|
|
44
|
+
params: { token: "abc" },
|
|
45
|
+
headers: { Authorization: "Bearer xyz" },
|
|
46
|
+
},
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
const Decorated = withPipesEndpoint(Wrapped);
|
|
50
|
+
const { getByTestId } = render(<Decorated uri="https://foo.com/path" />);
|
|
51
|
+
|
|
52
|
+
expect(getByTestId("wrapped").props.children).toBe(
|
|
53
|
+
'https://foo.com/path?token=abc|{"Authorization":"Bearer xyz"}'
|
|
54
|
+
);
|
|
55
|
+
});
|
|
56
|
+
});
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { withPipesEndpoint, buildUrlWithQuery } from "./withPipesEndpoint";
|
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
import React, { forwardRef, RefObject } from "react";
|
|
2
|
+
import URL from "url";
|
|
3
|
+
|
|
4
|
+
import { useBuildPipesUrl } from "@applicaster/zapp-react-native-utils/reactHooks/feed";
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Merges the query params resolved from a pipes endpoint context into the url.
|
|
8
|
+
* Returns the url unchanged when there is nothing to merge.
|
|
9
|
+
*/
|
|
10
|
+
export function buildUrlWithQuery(url: string, requestParams): string {
|
|
11
|
+
if (!url || !requestParams?.params) {
|
|
12
|
+
return url;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
const parsedURL = URL.parse(url, true);
|
|
16
|
+
|
|
17
|
+
parsedURL.query = { ...parsedURL.query, ...requestParams.params };
|
|
18
|
+
parsedURL.search = null;
|
|
19
|
+
|
|
20
|
+
return URL.format(parsedURL);
|
|
21
|
+
}
|
|
22
|
+
|
|
23
|
+
type Props = {
|
|
24
|
+
uri: string;
|
|
25
|
+
} & Record<string, unknown>;
|
|
26
|
+
|
|
27
|
+
/**
|
|
28
|
+
* HOC that resolves the wrapped component's `uri` against its matching Zapp
|
|
29
|
+
* Pipes endpoint. Endpoint context keys are added as query params (merged into
|
|
30
|
+
* the uri) and as request `headers`. Rendering is deferred until the context
|
|
31
|
+
* has been resolved so the component never loads without its required headers.
|
|
32
|
+
*/
|
|
33
|
+
export function withPipesEndpoint(Component) {
|
|
34
|
+
function WithPipesEndpoint(props: Props, ref: RefObject<unknown>) {
|
|
35
|
+
const { requestParams } = useBuildPipesUrl({ url: props.uri });
|
|
36
|
+
|
|
37
|
+
if (requestParams !== null) {
|
|
38
|
+
const urlWithQuery = buildUrlWithQuery(props.uri, requestParams);
|
|
39
|
+
|
|
40
|
+
return (
|
|
41
|
+
<Component
|
|
42
|
+
ref={ref}
|
|
43
|
+
{...props}
|
|
44
|
+
uri={urlWithQuery}
|
|
45
|
+
headers={requestParams.headers || {}}
|
|
46
|
+
/>
|
|
47
|
+
);
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
return null;
|
|
51
|
+
}
|
|
52
|
+
|
|
53
|
+
return forwardRef(WithPipesEndpoint);
|
|
54
|
+
}
|
|
@@ -0,0 +1,297 @@
|
|
|
1
|
+
import {
|
|
2
|
+
resolvePlayerContentText,
|
|
3
|
+
VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
4
|
+
AUDIO_PLAYER_CONTENT_DATA_KEYS,
|
|
5
|
+
createConfigValueGetter,
|
|
6
|
+
} from "../contentDataKeys";
|
|
7
|
+
|
|
8
|
+
const entry = {
|
|
9
|
+
id: "1",
|
|
10
|
+
type: { value: "audio" },
|
|
11
|
+
title: "Default Title",
|
|
12
|
+
summary: "Default Summary",
|
|
13
|
+
extensions: {
|
|
14
|
+
episode_name: "Custom Episode",
|
|
15
|
+
episode_subtitle: "Custom Subtitle",
|
|
16
|
+
blank: "",
|
|
17
|
+
show: { name: "Nested Show Name" },
|
|
18
|
+
genres: ["Drama", "Comedy"],
|
|
19
|
+
rating: 0,
|
|
20
|
+
is_featured: true,
|
|
21
|
+
},
|
|
22
|
+
} as unknown as ZappEntry;
|
|
23
|
+
|
|
24
|
+
const valueFrom =
|
|
25
|
+
(config: Record<string, unknown>): GetValue =>
|
|
26
|
+
(key: string) =>
|
|
27
|
+
(config[key] ?? null) as never;
|
|
28
|
+
|
|
29
|
+
const resolveTitle = (config: Record<string, unknown>, target = entry) =>
|
|
30
|
+
resolvePlayerContentText({
|
|
31
|
+
entry: target,
|
|
32
|
+
field: "title",
|
|
33
|
+
value: valueFrom(config),
|
|
34
|
+
});
|
|
35
|
+
|
|
36
|
+
const resolveSubtitle = (config: Record<string, unknown>, target = entry) =>
|
|
37
|
+
resolvePlayerContentText({
|
|
38
|
+
entry: target,
|
|
39
|
+
field: "subtitle",
|
|
40
|
+
value: valueFrom(config),
|
|
41
|
+
});
|
|
42
|
+
|
|
43
|
+
describe("resolvePlayerContentText", () => {
|
|
44
|
+
describe("backward compatibility", () => {
|
|
45
|
+
it("returns entry.title when no configuration is stored", () => {
|
|
46
|
+
expect(resolveTitle({})).toBe("Default Title");
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
it("returns entry.summary when no configuration is stored", () => {
|
|
50
|
+
expect(resolveSubtitle({})).toBe("Default Summary");
|
|
51
|
+
});
|
|
52
|
+
|
|
53
|
+
it("returns the defaults when the source is explicitly the default option", () => {
|
|
54
|
+
expect(
|
|
55
|
+
resolveTitle({
|
|
56
|
+
title_data_key_source: "title",
|
|
57
|
+
title_custom_data_key: "extensions.episode_name",
|
|
58
|
+
})
|
|
59
|
+
).toBe("Default Title");
|
|
60
|
+
|
|
61
|
+
expect(
|
|
62
|
+
resolveSubtitle({
|
|
63
|
+
subtitle_data_key_source: "summary",
|
|
64
|
+
subtitle_custom_data_key: "extensions.episode_subtitle",
|
|
65
|
+
})
|
|
66
|
+
).toBe("Default Summary");
|
|
67
|
+
});
|
|
68
|
+
});
|
|
69
|
+
|
|
70
|
+
describe("custom data key", () => {
|
|
71
|
+
it("resolves a dot path on the entry for the title", () => {
|
|
72
|
+
expect(
|
|
73
|
+
resolveTitle({
|
|
74
|
+
title_data_key_source: "other",
|
|
75
|
+
title_custom_data_key: "extensions.episode_name",
|
|
76
|
+
})
|
|
77
|
+
).toBe("Custom Episode");
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
it("resolves a dot path on the entry for the subtitle", () => {
|
|
81
|
+
expect(
|
|
82
|
+
resolveSubtitle({
|
|
83
|
+
subtitle_data_key_source: "other",
|
|
84
|
+
subtitle_custom_data_key: "extensions.episode_subtitle",
|
|
85
|
+
})
|
|
86
|
+
).toBe("Custom Subtitle");
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
it("resolves a nested dot path", () => {
|
|
90
|
+
expect(
|
|
91
|
+
resolveTitle({
|
|
92
|
+
title_data_key_source: "other",
|
|
93
|
+
title_custom_data_key: "extensions.show.name",
|
|
94
|
+
})
|
|
95
|
+
).toBe("Nested Show Name");
|
|
96
|
+
});
|
|
97
|
+
|
|
98
|
+
it("resolves a top level entry key", () => {
|
|
99
|
+
expect(
|
|
100
|
+
resolveTitle({
|
|
101
|
+
title_data_key_source: "other",
|
|
102
|
+
title_custom_data_key: "summary",
|
|
103
|
+
})
|
|
104
|
+
).toBe("Default Summary");
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
it("trims surrounding whitespace from the configured key", () => {
|
|
108
|
+
expect(
|
|
109
|
+
resolveTitle({
|
|
110
|
+
title_data_key_source: "other",
|
|
111
|
+
title_custom_data_key: " extensions.episode_name ",
|
|
112
|
+
})
|
|
113
|
+
).toBe("Custom Episode");
|
|
114
|
+
});
|
|
115
|
+
});
|
|
116
|
+
|
|
117
|
+
describe("fallbacks", () => {
|
|
118
|
+
it("falls back to the default when the custom key is empty", () => {
|
|
119
|
+
expect(
|
|
120
|
+
resolveTitle({
|
|
121
|
+
title_data_key_source: "other",
|
|
122
|
+
title_custom_data_key: "",
|
|
123
|
+
})
|
|
124
|
+
).toBe("Default Title");
|
|
125
|
+
});
|
|
126
|
+
|
|
127
|
+
it("falls back to the default when the custom key is whitespace only", () => {
|
|
128
|
+
expect(
|
|
129
|
+
resolveTitle({
|
|
130
|
+
title_data_key_source: "other",
|
|
131
|
+
title_custom_data_key: " ",
|
|
132
|
+
})
|
|
133
|
+
).toBe("Default Title");
|
|
134
|
+
});
|
|
135
|
+
|
|
136
|
+
it("falls back to the default when the custom key does not resolve", () => {
|
|
137
|
+
expect(
|
|
138
|
+
resolveTitle({
|
|
139
|
+
title_data_key_source: "other",
|
|
140
|
+
title_custom_data_key: "extensions.does_not_exist",
|
|
141
|
+
})
|
|
142
|
+
).toBe("Default Title");
|
|
143
|
+
});
|
|
144
|
+
|
|
145
|
+
it("falls back to the default when the custom key resolves to an empty string", () => {
|
|
146
|
+
expect(
|
|
147
|
+
resolveTitle({
|
|
148
|
+
title_data_key_source: "other",
|
|
149
|
+
title_custom_data_key: "extensions.blank",
|
|
150
|
+
})
|
|
151
|
+
).toBe("Default Title");
|
|
152
|
+
});
|
|
153
|
+
|
|
154
|
+
// The Studio field is free text, so a customer can easily stop one
|
|
155
|
+
// segment short (`extensions.show` rather than `extensions.show.name`)
|
|
156
|
+
// or aim the key at a list field. Rendering those would throw
|
|
157
|
+
// "Objects are not valid as a React child" and red-screen every screen
|
|
158
|
+
// containing the player.
|
|
159
|
+
it("falls back to the default when the custom key resolves to an object", () => {
|
|
160
|
+
expect(
|
|
161
|
+
resolveTitle({
|
|
162
|
+
title_data_key_source: "other",
|
|
163
|
+
title_custom_data_key: "extensions.show",
|
|
164
|
+
})
|
|
165
|
+
).toBe("Default Title");
|
|
166
|
+
});
|
|
167
|
+
|
|
168
|
+
it("falls back to the default when the custom key resolves to an array", () => {
|
|
169
|
+
expect(
|
|
170
|
+
resolveSubtitle({
|
|
171
|
+
subtitle_data_key_source: "other",
|
|
172
|
+
subtitle_custom_data_key: "extensions.genres",
|
|
173
|
+
})
|
|
174
|
+
).toBe("Default Summary");
|
|
175
|
+
});
|
|
176
|
+
|
|
177
|
+
it("falls back to the default when the custom key resolves to a boolean", () => {
|
|
178
|
+
expect(
|
|
179
|
+
resolveTitle({
|
|
180
|
+
title_data_key_source: "other",
|
|
181
|
+
title_custom_data_key: "extensions.is_featured",
|
|
182
|
+
})
|
|
183
|
+
).toBe("Default Title");
|
|
184
|
+
});
|
|
185
|
+
|
|
186
|
+
// Numbers are renderable, so the guard above must not swallow them -
|
|
187
|
+
// including 0, which is falsy but perfectly displayable.
|
|
188
|
+
it("returns a numeric custom value rather than falling back", () => {
|
|
189
|
+
expect(
|
|
190
|
+
resolveTitle({
|
|
191
|
+
title_data_key_source: "other",
|
|
192
|
+
title_custom_data_key: "extensions.rating",
|
|
193
|
+
})
|
|
194
|
+
).toBe(0);
|
|
195
|
+
});
|
|
196
|
+
});
|
|
197
|
+
|
|
198
|
+
describe("missing entry", () => {
|
|
199
|
+
it("returns undefined without throwing when the entry is undefined", () => {
|
|
200
|
+
expect(
|
|
201
|
+
resolvePlayerContentText({
|
|
202
|
+
entry: undefined,
|
|
203
|
+
field: "title",
|
|
204
|
+
value: valueFrom({}),
|
|
205
|
+
})
|
|
206
|
+
).toBeUndefined();
|
|
207
|
+
});
|
|
208
|
+
|
|
209
|
+
it("returns undefined without throwing when a custom key is set", () => {
|
|
210
|
+
expect(
|
|
211
|
+
resolvePlayerContentText({
|
|
212
|
+
entry: undefined,
|
|
213
|
+
field: "title",
|
|
214
|
+
value: valueFrom({
|
|
215
|
+
title_data_key_source: "other",
|
|
216
|
+
title_custom_data_key: "extensions.episode_name",
|
|
217
|
+
}),
|
|
218
|
+
})
|
|
219
|
+
).toBeUndefined();
|
|
220
|
+
});
|
|
221
|
+
});
|
|
222
|
+
});
|
|
223
|
+
|
|
224
|
+
describe("custom data key sets", () => {
|
|
225
|
+
it("reads the TV video keys when given that key set", () => {
|
|
226
|
+
const value = createConfigValueGetter({
|
|
227
|
+
video_player_title_data_key_source: "other",
|
|
228
|
+
video_player_title_custom_data_key: "extensions.episode_name",
|
|
229
|
+
});
|
|
230
|
+
|
|
231
|
+
expect(
|
|
232
|
+
resolvePlayerContentText({
|
|
233
|
+
entry,
|
|
234
|
+
field: "title",
|
|
235
|
+
value,
|
|
236
|
+
dataKeys: VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
237
|
+
})
|
|
238
|
+
).toBe("Custom Episode");
|
|
239
|
+
});
|
|
240
|
+
|
|
241
|
+
it("reads the TV audio keys when given that key set", () => {
|
|
242
|
+
const value = createConfigValueGetter({
|
|
243
|
+
audio_player_summary_data_key_source: "other",
|
|
244
|
+
audio_player_summary_custom_data_key: "extensions.episode_subtitle",
|
|
245
|
+
});
|
|
246
|
+
|
|
247
|
+
expect(
|
|
248
|
+
resolvePlayerContentText({
|
|
249
|
+
entry,
|
|
250
|
+
field: "subtitle",
|
|
251
|
+
value,
|
|
252
|
+
dataKeys: AUDIO_PLAYER_CONTENT_DATA_KEYS,
|
|
253
|
+
})
|
|
254
|
+
).toBe("Custom Subtitle");
|
|
255
|
+
});
|
|
256
|
+
|
|
257
|
+
it("ignores the mobile keys when a TV key set is supplied", () => {
|
|
258
|
+
const value = createConfigValueGetter({
|
|
259
|
+
title_data_key_source: "other",
|
|
260
|
+
title_custom_data_key: "extensions.episode_name",
|
|
261
|
+
});
|
|
262
|
+
|
|
263
|
+
expect(
|
|
264
|
+
resolvePlayerContentText({
|
|
265
|
+
entry,
|
|
266
|
+
field: "title",
|
|
267
|
+
value,
|
|
268
|
+
dataKeys: VIDEO_PLAYER_CONTENT_DATA_KEYS,
|
|
269
|
+
})
|
|
270
|
+
).toBe("Default Title");
|
|
271
|
+
});
|
|
272
|
+
|
|
273
|
+
it("defaults to the mobile key set when dataKeys is omitted", () => {
|
|
274
|
+
const value = createConfigValueGetter({
|
|
275
|
+
title_data_key_source: "other",
|
|
276
|
+
title_custom_data_key: "extensions.episode_name",
|
|
277
|
+
});
|
|
278
|
+
|
|
279
|
+
expect(resolvePlayerContentText({ entry, field: "title", value })).toBe(
|
|
280
|
+
"Custom Episode"
|
|
281
|
+
);
|
|
282
|
+
});
|
|
283
|
+
});
|
|
284
|
+
|
|
285
|
+
describe("createConfigValueGetter", () => {
|
|
286
|
+
it("returns null for a missing key", () => {
|
|
287
|
+
expect(createConfigValueGetter({})("anything")).toBeNull();
|
|
288
|
+
});
|
|
289
|
+
|
|
290
|
+
it("returns null for an undefined configuration", () => {
|
|
291
|
+
expect(createConfigValueGetter(undefined)("anything")).toBeNull();
|
|
292
|
+
});
|
|
293
|
+
|
|
294
|
+
it("returns the stored value", () => {
|
|
295
|
+
expect(createConfigValueGetter({ a: "b" })("a")).toBe("b");
|
|
296
|
+
});
|
|
297
|
+
});
|
|
@@ -0,0 +1,138 @@
|
|
|
1
|
+
import { resolvePlayerActions } from "../resolvePlayerActions";
|
|
2
|
+
import { selectActionButtons } from "../../conf/player/selectors";
|
|
3
|
+
import { uiActionsRegistry } from "../../uiActionsRegistrator";
|
|
4
|
+
|
|
5
|
+
jest.mock("../../conf/player/selectors", () => ({
|
|
6
|
+
selectActionButtons: jest.fn(),
|
|
7
|
+
}));
|
|
8
|
+
|
|
9
|
+
const action = (identifier: string) =>
|
|
10
|
+
({ identifier, action: { invokeAction: jest.fn() } }) as any;
|
|
11
|
+
|
|
12
|
+
describe("resolvePlayerActions", () => {
|
|
13
|
+
const entry = {
|
|
14
|
+
id: "e1",
|
|
15
|
+
extensions: {
|
|
16
|
+
entry_action: [
|
|
17
|
+
{ button: { alias: "add_to_playlist" }, actions: [{ type: "test" }] },
|
|
18
|
+
{ button: { alias: "add_to_queue" }, actions: [{ type: "test" }] },
|
|
19
|
+
],
|
|
20
|
+
},
|
|
21
|
+
};
|
|
22
|
+
|
|
23
|
+
// The entry's own actions never reach the registry; the caller expands them.
|
|
24
|
+
const expandEntryActions = jest.fn(() => [
|
|
25
|
+
action("entry_action_0"),
|
|
26
|
+
action("entry_action_1"),
|
|
27
|
+
]);
|
|
28
|
+
|
|
29
|
+
beforeEach(() => {
|
|
30
|
+
expandEntryActions.mockClear();
|
|
31
|
+
|
|
32
|
+
jest
|
|
33
|
+
.spyOn(uiActionsRegistry, "getActions")
|
|
34
|
+
.mockImplementation((name) => [action(name)]);
|
|
35
|
+
});
|
|
36
|
+
|
|
37
|
+
afterEach(() => {
|
|
38
|
+
jest.restoreAllMocks();
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
it("expands entry_actions through the caller and keeps config order", () => {
|
|
42
|
+
(selectActionButtons as jest.Mock).mockReturnValue(
|
|
43
|
+
"entry_actions,local_storage_favourites_action,offline-content-button"
|
|
44
|
+
);
|
|
45
|
+
|
|
46
|
+
const result = resolvePlayerActions({
|
|
47
|
+
configuration: {},
|
|
48
|
+
entry,
|
|
49
|
+
expandEntryActions,
|
|
50
|
+
});
|
|
51
|
+
|
|
52
|
+
expect(expandEntryActions).toHaveBeenCalledWith(entry);
|
|
53
|
+
|
|
54
|
+
expect(uiActionsRegistry.getActions).not.toHaveBeenCalledWith(
|
|
55
|
+
"entry_actions",
|
|
56
|
+
entry
|
|
57
|
+
);
|
|
58
|
+
|
|
59
|
+
expect(result.map((item) => item.identifier)).toEqual([
|
|
60
|
+
"entry_action_0",
|
|
61
|
+
"entry_action_1",
|
|
62
|
+
"local_storage_favourites_action",
|
|
63
|
+
"offline-content-button",
|
|
64
|
+
]);
|
|
65
|
+
});
|
|
66
|
+
|
|
67
|
+
it.each([undefined, null, ""])(
|
|
68
|
+
"resolves nothing when the config is %p",
|
|
69
|
+
(configured) => {
|
|
70
|
+
(selectActionButtons as jest.Mock).mockReturnValue(configured);
|
|
71
|
+
|
|
72
|
+
expect(
|
|
73
|
+
resolvePlayerActions({ configuration: {}, entry, expandEntryActions })
|
|
74
|
+
).toEqual([]);
|
|
75
|
+
}
|
|
76
|
+
);
|
|
77
|
+
|
|
78
|
+
it("does not cap the resolved list at two items", () => {
|
|
79
|
+
(selectActionButtons as jest.Mock).mockReturnValue("a,b,c");
|
|
80
|
+
|
|
81
|
+
expect(
|
|
82
|
+
resolvePlayerActions({
|
|
83
|
+
configuration: {},
|
|
84
|
+
entry,
|
|
85
|
+
expandEntryActions,
|
|
86
|
+
}).map((item) => item.identifier)
|
|
87
|
+
).toEqual(["a", "b", "c"]);
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
it("has no special case for any plugin identifier", () => {
|
|
91
|
+
(selectActionButtons as jest.Mock).mockReturnValue(
|
|
92
|
+
"open-modal-bottom-sheet-cell-action,local_storage_favourites_action"
|
|
93
|
+
);
|
|
94
|
+
|
|
95
|
+
expect(
|
|
96
|
+
resolvePlayerActions({
|
|
97
|
+
configuration: {},
|
|
98
|
+
entry,
|
|
99
|
+
expandEntryActions,
|
|
100
|
+
}).map((item) => item.identifier)
|
|
101
|
+
).toEqual([
|
|
102
|
+
"open-modal-bottom-sheet-cell-action",
|
|
103
|
+
"local_storage_favourites_action",
|
|
104
|
+
]);
|
|
105
|
+
});
|
|
106
|
+
|
|
107
|
+
it("collapses a repeated identifier in the config string", () => {
|
|
108
|
+
(selectActionButtons as jest.Mock).mockReturnValue(
|
|
109
|
+
"favorites,favorites,share"
|
|
110
|
+
);
|
|
111
|
+
|
|
112
|
+
expect(
|
|
113
|
+
resolvePlayerActions({
|
|
114
|
+
configuration: {},
|
|
115
|
+
entry,
|
|
116
|
+
expandEntryActions,
|
|
117
|
+
}).map((item) => item.identifier)
|
|
118
|
+
).toEqual(["favorites", "share"]);
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
it("drops resolved items that cannot be invoked", () => {
|
|
122
|
+
(selectActionButtons as jest.Mock).mockReturnValue("broken,share");
|
|
123
|
+
|
|
124
|
+
(uiActionsRegistry.getActions as jest.Mock).mockImplementation((name) =>
|
|
125
|
+
name === "broken"
|
|
126
|
+
? [{ identifier: "broken" } as any]
|
|
127
|
+
: [action(name as string)]
|
|
128
|
+
);
|
|
129
|
+
|
|
130
|
+
expect(
|
|
131
|
+
resolvePlayerActions({
|
|
132
|
+
configuration: {},
|
|
133
|
+
entry,
|
|
134
|
+
expandEntryActions,
|
|
135
|
+
}).map((item) => item.identifier)
|
|
136
|
+
).toEqual(["share"]);
|
|
137
|
+
});
|
|
138
|
+
});
|