@applicaster/zapp-react-native-utils 16.0.0-rc.5 → 16.0.0-rc.50
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 +8 -10
- package/actionsExecutor/ActionExecutorContext.tsx +43 -326
- package/actionsExecutor/actions/appRestart.ts +24 -0
- package/actionsExecutor/actions/confirmDialog.ts +53 -0
- package/actionsExecutor/actions/index.ts +30 -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 +123 -0
- package/actionsExecutor/actions/refreshComponent.ts +79 -0
- package/actionsExecutor/actions/screenSetVariable.ts +35 -0
- package/actionsExecutor/actions/screenToggleFlag.ts +38 -0
- package/actionsExecutor/actions/sendCloudEvent.ts +88 -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/showToast.ts +31 -0
- package/actionsExecutor/actions/switchLayout.ts +40 -0
- package/actionsExecutor/types.ts +59 -0
- package/analyticsUtils/AnalyticsEvents/sendMenuClickEvent.ts +2 -2
- package/analyticsUtils/PlayerAnalyticsManager.ts +11 -1
- 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 +3 -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 +12 -6
- package/appUtils/playerManager/__tests__/playerFactory.test.ts +150 -0
- package/appUtils/playerManager/conts.ts +6 -0
- package/appUtils/playerManager/playerFactory.ts +17 -34
- 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__/sample.test.ts +61 -0
- package/arrayUtils/index.ts +57 -20
- package/bottomSheet/__tests__/scrollContext.test.tsx +35 -0
- package/bottomSheet/index.ts +17 -0
- package/cellUtils/index.ts +3 -5
- package/colorUtils/__tests__/isTransparentColor.test.ts +76 -0
- package/colorUtils/__tests__/isValidColor.test.ts +70 -0
- package/colorUtils/index.ts +50 -0
- package/manifestUtils/_internals/index.js +6 -0
- package/manifestUtils/defaultManifestConfigurations/generalContent.js +35 -0
- package/manifestUtils/defaultManifestConfigurations/player.js +19 -19
- package/manifestUtils/fieldUtils/__tests__/fieldUtils.test.js +84 -0
- package/manifestUtils/fieldUtils/index.js +125 -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/platformIsTV.js +1 -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/index.ts +24 -2
- package/reactHooks/actions/index.ts +51 -1
- package/reactHooks/cell-click/index.ts +18 -10
- 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/navigation/__mocks__/index.ts +4 -0
- package/reactHooks/navigation/__tests__/useIsScreenActive.test.ts +42 -0
- package/reactHooks/navigation/index.ts +1 -1
- package/reactHooks/navigation/useIsScreenActive.ts +29 -8
- package/reactHooks/state/useComponentScreenState.ts +1 -1
- package/reactHooks/utils/index.ts +3 -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/index.ts +203 -0
- package/zappFrameworkUtils/__tests__/localStorageHelper.test.ts +146 -0
- package/zappFrameworkUtils/localStorageHelper.ts +9 -13
- package/reactHooks/feed/__mocks__/usePipesCacheReset.ts +0 -1
|
@@ -0,0 +1,203 @@
|
|
|
1
|
+
/* eslint-disable no-dupe-class-members */
|
|
2
|
+
import { Observable } from "rxjs";
|
|
3
|
+
import { createLogger } from "../logger";
|
|
4
|
+
|
|
5
|
+
const { log_debug, log_warning, log_verbose } = createLogger({
|
|
6
|
+
subsystem: "UIActionsRegistry",
|
|
7
|
+
category: "ActionRegistration",
|
|
8
|
+
});
|
|
9
|
+
|
|
10
|
+
/**
|
|
11
|
+
* The runtime value of a UI action.
|
|
12
|
+
*
|
|
13
|
+
* This is the object that consumers interact with (render buttons for,
|
|
14
|
+
* invoke on press, read initial state from, etc.). It intentionally keeps an
|
|
15
|
+
* open shape (`[K: string]: any`) so that both the modern registry-based
|
|
16
|
+
* actions and the legacy context-provider based actions can be represented by
|
|
17
|
+
* the same structure.
|
|
18
|
+
*/
|
|
19
|
+
export type RegisteredActionValue = {
|
|
20
|
+
state?: any;
|
|
21
|
+
getInitialState?: () => Promise<void>;
|
|
22
|
+
initialEntryState?: (item: ZappEntry | ZappFeed) => CellActionEntryState;
|
|
23
|
+
invokeAction: (
|
|
24
|
+
item: ZappEntry | ZappFeed,
|
|
25
|
+
options?: InvokeArgsOptions
|
|
26
|
+
) => void;
|
|
27
|
+
isActionAvailable?: (item: ZappEntry | ZappFeed) => boolean;
|
|
28
|
+
addListener?: (
|
|
29
|
+
entryId: string,
|
|
30
|
+
listener: CellActionStateListenerFunction
|
|
31
|
+
) => CellActionStateRemoveListenerFunction;
|
|
32
|
+
/**
|
|
33
|
+
* Optional RX stream of the action state for a given entry. When not
|
|
34
|
+
* provided, `observeEntryState` derives one from `initialEntryState` +
|
|
35
|
+
* `addListener` (see below).
|
|
36
|
+
*/
|
|
37
|
+
observeEntryState?: (
|
|
38
|
+
entry: ZappEntry | ZappFeed
|
|
39
|
+
) => Observable<CellActionEntryState>;
|
|
40
|
+
[K: string]: any;
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
export type RegisteredAction = {
|
|
44
|
+
identifier: string; // Plugin identifier or synthetic name
|
|
45
|
+
action: RegisteredActionValue;
|
|
46
|
+
};
|
|
47
|
+
|
|
48
|
+
/**
|
|
49
|
+
* A function that, given an optional context (currently just the `entry`),
|
|
50
|
+
* returns the list of actions it wants to contribute.
|
|
51
|
+
*
|
|
52
|
+
* Returning an array is what allows a single provider (plugin or otherwise) to
|
|
53
|
+
* expose more than one action, and to compute those actions based on the entry.
|
|
54
|
+
*/
|
|
55
|
+
export type UIActionProvider = (params: {
|
|
56
|
+
entry?: ZappEntry | ZappFeed;
|
|
57
|
+
}) => RegisteredAction[];
|
|
58
|
+
|
|
59
|
+
/**
|
|
60
|
+
* Returns an RX `Observable` that emits the action state for `entry`.
|
|
61
|
+
*
|
|
62
|
+
* If the action already exposes its own `observeEntryState`, it is used as-is.
|
|
63
|
+
* Otherwise we build the stream from the legacy imperative API:
|
|
64
|
+
* - it immediately emits `initialEntryState(entry)` (if available), and
|
|
65
|
+
* - it subscribes to further changes via `addListener(entryId, listener)`,
|
|
66
|
+
* unsubscribing automatically when the observable is torn down.
|
|
67
|
+
*
|
|
68
|
+
* This lets every action - old or new - be consumed reactively through a single
|
|
69
|
+
* mechanism, without each consumer having to wire up `addListener` manually.
|
|
70
|
+
*/
|
|
71
|
+
export function observeEntryState(
|
|
72
|
+
action: RegisteredActionValue | undefined,
|
|
73
|
+
entry: ZappEntry | ZappFeed
|
|
74
|
+
): Observable<CellActionEntryState> {
|
|
75
|
+
if (typeof action?.observeEntryState === "function") {
|
|
76
|
+
return action.observeEntryState(entry);
|
|
77
|
+
}
|
|
78
|
+
|
|
79
|
+
return new Observable<CellActionEntryState>((subscriber) => {
|
|
80
|
+
const initialState = action?.initialEntryState?.(entry);
|
|
81
|
+
|
|
82
|
+
if (initialState !== undefined) {
|
|
83
|
+
subscriber.next(initialState);
|
|
84
|
+
}
|
|
85
|
+
|
|
86
|
+
const removeListener = action?.addListener?.(
|
|
87
|
+
String((entry as ZappEntry)?.id),
|
|
88
|
+
(state: CellActionEntryState) => subscriber.next(state)
|
|
89
|
+
);
|
|
90
|
+
|
|
91
|
+
return () => removeListener?.();
|
|
92
|
+
});
|
|
93
|
+
}
|
|
94
|
+
|
|
95
|
+
class UIActionsRegistry {
|
|
96
|
+
private registeredActions: Record<string, UIActionProvider> = {};
|
|
97
|
+
|
|
98
|
+
/**
|
|
99
|
+
* Register a dynamic action provider under a unique `name`.
|
|
100
|
+
* The provider can return one or more actions and may use the passed `entry`.
|
|
101
|
+
* Returns an unregister function.
|
|
102
|
+
*/
|
|
103
|
+
registerActionProvider(
|
|
104
|
+
name: string,
|
|
105
|
+
actionProvider: UIActionProvider
|
|
106
|
+
): () => void {
|
|
107
|
+
const isOverride = Boolean(this.registeredActions[name]);
|
|
108
|
+
|
|
109
|
+
if (isOverride) {
|
|
110
|
+
log_warning(
|
|
111
|
+
`registerActionProvider: overriding existing provider for "${name}"`,
|
|
112
|
+
{ name }
|
|
113
|
+
);
|
|
114
|
+
} else {
|
|
115
|
+
log_debug(`registerActionProvider: registered "${name}"`, { name });
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
this.registeredActions[name] = actionProvider;
|
|
119
|
+
|
|
120
|
+
return () => {
|
|
121
|
+
// Only remove if it's still the same provider to avoid races where a
|
|
122
|
+
// newer registration replaced this one.
|
|
123
|
+
if (this.registeredActions[name] === actionProvider) {
|
|
124
|
+
delete this.registeredActions[name];
|
|
125
|
+
log_debug(`registerActionProvider: unregistered "${name}"`, { name });
|
|
126
|
+
} else {
|
|
127
|
+
log_debug(
|
|
128
|
+
`registerActionProvider: skipped unregister for "${name}" – newer provider is active`,
|
|
129
|
+
{ name }
|
|
130
|
+
);
|
|
131
|
+
}
|
|
132
|
+
};
|
|
133
|
+
}
|
|
134
|
+
|
|
135
|
+
/**
|
|
136
|
+
* Convenience helper to register a single, static action from anywhere in the
|
|
137
|
+
* app (it does not need to be a plugin). Returns an unregister function.
|
|
138
|
+
*/
|
|
139
|
+
registerAction(
|
|
140
|
+
identifier: string,
|
|
141
|
+
action: RegisteredActionValue
|
|
142
|
+
): () => void {
|
|
143
|
+
log_debug(`registerAction: registering single action "${identifier}"`, {
|
|
144
|
+
identifier,
|
|
145
|
+
});
|
|
146
|
+
|
|
147
|
+
return this.registerActionProvider(identifier, () => [
|
|
148
|
+
{ identifier, action },
|
|
149
|
+
]);
|
|
150
|
+
}
|
|
151
|
+
|
|
152
|
+
getEntryActions(entry: ZappEntry): RegisteredAction[] {
|
|
153
|
+
const results = Object.keys(this.registeredActions)
|
|
154
|
+
.map((key) => this.registeredActions[key]({ entry }))
|
|
155
|
+
.flatMap((a) => a);
|
|
156
|
+
|
|
157
|
+
log_verbose(
|
|
158
|
+
`getEntryActions: resolved ${results.length} action(s) for entry "${entry?.id}"`,
|
|
159
|
+
{ entryId: entry?.id, identifiers: results.map((r) => r.identifier) }
|
|
160
|
+
);
|
|
161
|
+
|
|
162
|
+
return results;
|
|
163
|
+
}
|
|
164
|
+
|
|
165
|
+
getActions(name: string, entry?: ZappEntry | ZappFeed): RegisteredAction[] {
|
|
166
|
+
if (!this.registeredActions[name]) {
|
|
167
|
+
log_warning(`getActions: no provider found for "${name}"`, { name });
|
|
168
|
+
|
|
169
|
+
return [];
|
|
170
|
+
}
|
|
171
|
+
|
|
172
|
+
const results = this.registeredActions[name]({ entry }) ?? [];
|
|
173
|
+
|
|
174
|
+
log_verbose(
|
|
175
|
+
`getActions: resolved ${results.length} action(s) for "${name}"`,
|
|
176
|
+
{
|
|
177
|
+
name,
|
|
178
|
+
entryId: (entry as ZappEntry)?.id,
|
|
179
|
+
identifiers: results.map((r) => r.identifier),
|
|
180
|
+
}
|
|
181
|
+
);
|
|
182
|
+
|
|
183
|
+
return results;
|
|
184
|
+
}
|
|
185
|
+
|
|
186
|
+
/**
|
|
187
|
+
* Returns the runtime value of the first action registered under `name`, or
|
|
188
|
+
* `undefined`. This mirrors the shape returned by the legacy `useActions`
|
|
189
|
+
* hook, easing migration of single-action consumers.
|
|
190
|
+
*/
|
|
191
|
+
getAction(
|
|
192
|
+
name: string,
|
|
193
|
+
entry?: ZappEntry | ZappFeed
|
|
194
|
+
): RegisteredActionValue | undefined {
|
|
195
|
+
return this.getActions(name, entry)[0]?.action;
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
hasAction(name: string): boolean {
|
|
199
|
+
return Boolean(this.registeredActions[name]);
|
|
200
|
+
}
|
|
201
|
+
}
|
|
202
|
+
|
|
203
|
+
export const uiActionsRegistry = new UIActionsRegistry();
|
|
@@ -0,0 +1,146 @@
|
|
|
1
|
+
import {
|
|
2
|
+
batchSaveOwnedValues,
|
|
3
|
+
batchRemoveOwnedValues,
|
|
4
|
+
} from "../localStorageHelper";
|
|
5
|
+
import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage";
|
|
6
|
+
|
|
7
|
+
// Mock localStorage
|
|
8
|
+
jest.mock(
|
|
9
|
+
"@applicaster/zapp-react-native-bridge/ZappStorage/LocalStorage",
|
|
10
|
+
() => ({
|
|
11
|
+
localStorage: {
|
|
12
|
+
getItem: jest.fn(),
|
|
13
|
+
setItem: jest.fn(),
|
|
14
|
+
removeItem: jest.fn(),
|
|
15
|
+
},
|
|
16
|
+
})
|
|
17
|
+
);
|
|
18
|
+
|
|
19
|
+
describe("localStorageHelper", () => {
|
|
20
|
+
const ownershipKey = "test_ownership_key";
|
|
21
|
+
const ownershipNamespace = "test_namespace";
|
|
22
|
+
|
|
23
|
+
beforeEach(() => {
|
|
24
|
+
jest.clearAllMocks();
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
describe("addOwnedKeys via batchSaveOwnedValues", () => {
|
|
28
|
+
it("should add new keys to existing owned keys", async () => {
|
|
29
|
+
// Setup existing keys in storage
|
|
30
|
+
const existingKeys = {
|
|
31
|
+
namespace1: ["key1"],
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
(localStorage.getItem as jest.Mock).mockResolvedValue(
|
|
35
|
+
JSON.stringify(existingKeys)
|
|
36
|
+
);
|
|
37
|
+
|
|
38
|
+
const newValues = {
|
|
39
|
+
namespace1: { key2: "value2" },
|
|
40
|
+
namespace2: { key3: "value3" },
|
|
41
|
+
};
|
|
42
|
+
|
|
43
|
+
await batchSaveOwnedValues({
|
|
44
|
+
storageValues: newValues,
|
|
45
|
+
ownershipKey,
|
|
46
|
+
ownershipNamespace,
|
|
47
|
+
});
|
|
48
|
+
|
|
49
|
+
// Verify localStorage.setItem was called with correct updated keys
|
|
50
|
+
// Note: order of keys in array might vary depending on Set implementation, but usually insertion order
|
|
51
|
+
// However, to be safe, we can parse the argument and check contents
|
|
52
|
+
|
|
53
|
+
const lastCall = (localStorage.setItem as jest.Mock).mock.calls.find(
|
|
54
|
+
(call) => call[0] === ownershipKey
|
|
55
|
+
);
|
|
56
|
+
|
|
57
|
+
expect(lastCall).toBeDefined();
|
|
58
|
+
const savedData = JSON.parse(lastCall[1]);
|
|
59
|
+
|
|
60
|
+
expect(savedData.namespace1).toContain("key1");
|
|
61
|
+
expect(savedData.namespace1).toContain("key2");
|
|
62
|
+
expect(savedData.namespace2).toContain("key3");
|
|
63
|
+
});
|
|
64
|
+
|
|
65
|
+
it("should handle empty existing keys", async () => {
|
|
66
|
+
(localStorage.getItem as jest.Mock).mockResolvedValue(null);
|
|
67
|
+
|
|
68
|
+
const newValues = {
|
|
69
|
+
namespace1: { key1: "value1" },
|
|
70
|
+
};
|
|
71
|
+
|
|
72
|
+
await batchSaveOwnedValues({
|
|
73
|
+
storageValues: newValues,
|
|
74
|
+
ownershipKey,
|
|
75
|
+
ownershipNamespace,
|
|
76
|
+
});
|
|
77
|
+
|
|
78
|
+
const lastCall = (localStorage.setItem as jest.Mock).mock.calls.find(
|
|
79
|
+
(call) => call[0] === ownershipKey
|
|
80
|
+
);
|
|
81
|
+
|
|
82
|
+
expect(lastCall).toBeDefined();
|
|
83
|
+
const savedData = JSON.parse(lastCall[1]);
|
|
84
|
+
|
|
85
|
+
expect(savedData.namespace1).toEqual(["key1"]);
|
|
86
|
+
});
|
|
87
|
+
});
|
|
88
|
+
|
|
89
|
+
describe("removeOwnedKeys via batchRemoveOwnedValues", () => {
|
|
90
|
+
it("should remove keys from owned keys", async () => {
|
|
91
|
+
const existingKeys = {
|
|
92
|
+
namespace1: ["key1", "key2"],
|
|
93
|
+
namespace2: ["key3"],
|
|
94
|
+
};
|
|
95
|
+
|
|
96
|
+
(localStorage.getItem as jest.Mock).mockResolvedValue(
|
|
97
|
+
JSON.stringify(existingKeys)
|
|
98
|
+
);
|
|
99
|
+
|
|
100
|
+
const keysToRemove = {
|
|
101
|
+
namespace1: ["key1"],
|
|
102
|
+
};
|
|
103
|
+
|
|
104
|
+
await batchRemoveOwnedValues({
|
|
105
|
+
storageValues: keysToRemove,
|
|
106
|
+
ownershipKey,
|
|
107
|
+
ownershipNamespace,
|
|
108
|
+
});
|
|
109
|
+
|
|
110
|
+
const lastCall = (localStorage.setItem as jest.Mock).mock.calls.find(
|
|
111
|
+
(call) => call[0] === ownershipKey
|
|
112
|
+
);
|
|
113
|
+
|
|
114
|
+
expect(lastCall).toBeDefined();
|
|
115
|
+
const savedData = JSON.parse(lastCall[1]);
|
|
116
|
+
|
|
117
|
+
expect(savedData.namespace1).toEqual(["key2"]);
|
|
118
|
+
expect(savedData.namespace2).toEqual(["key3"]);
|
|
119
|
+
});
|
|
120
|
+
|
|
121
|
+
it("should remove namespace if all keys removed", async () => {
|
|
122
|
+
const existingKeys = {
|
|
123
|
+
namespace1: ["key1"],
|
|
124
|
+
};
|
|
125
|
+
|
|
126
|
+
(localStorage.getItem as jest.Mock).mockResolvedValue(
|
|
127
|
+
JSON.stringify(existingKeys)
|
|
128
|
+
);
|
|
129
|
+
|
|
130
|
+
const keysToRemove = {
|
|
131
|
+
namespace1: ["key1"],
|
|
132
|
+
};
|
|
133
|
+
|
|
134
|
+
await batchRemoveOwnedValues({
|
|
135
|
+
storageValues: keysToRemove,
|
|
136
|
+
ownershipKey,
|
|
137
|
+
ownershipNamespace,
|
|
138
|
+
});
|
|
139
|
+
|
|
140
|
+
expect(localStorage.removeItem).toHaveBeenCalledWith(
|
|
141
|
+
ownershipKey,
|
|
142
|
+
ownershipNamespace
|
|
143
|
+
);
|
|
144
|
+
});
|
|
145
|
+
});
|
|
146
|
+
});
|
|
@@ -2,10 +2,10 @@ import { localStorage } from "@applicaster/zapp-react-native-bridge/ZappStorage/
|
|
|
2
2
|
import { isNilOrEmpty } from "../reactUtils/helpers";
|
|
3
3
|
import { parseJsonIfNeeded } from "@applicaster/zapp-react-native-utils/functionUtils";
|
|
4
4
|
import {
|
|
5
|
-
StorageOwnedValues,
|
|
6
5
|
NamespaceValues,
|
|
7
|
-
|
|
6
|
+
StorageOwnedValues,
|
|
8
7
|
StorageValuesToAdd,
|
|
8
|
+
StorageValuesToRemove,
|
|
9
9
|
} from "./types";
|
|
10
10
|
import { Storage } from "@applicaster/zapp-react-native-bridge/ZappStorage/Storage";
|
|
11
11
|
|
|
@@ -43,10 +43,10 @@ function mapOwnedKeysToAdd(
|
|
|
43
43
|
): StorageOwnedValues {
|
|
44
44
|
const mappedData = {};
|
|
45
45
|
|
|
46
|
-
Object.keys(storageValues)
|
|
46
|
+
for (const namespace of Object.keys(storageValues)) {
|
|
47
47
|
const data = storageValues[namespace];
|
|
48
48
|
mappedData[namespace] = Object.keys(data);
|
|
49
|
-
}
|
|
49
|
+
}
|
|
50
50
|
|
|
51
51
|
return mappedData;
|
|
52
52
|
}
|
|
@@ -111,12 +111,12 @@ async function addOwnedKeys({
|
|
|
111
111
|
ownershipNamespace
|
|
112
112
|
);
|
|
113
113
|
|
|
114
|
-
Object.keys(newKeys)
|
|
114
|
+
for (const namespace of Object.keys(newKeys)) {
|
|
115
115
|
const newOwnedKeys: string[] = newKeys[namespace];
|
|
116
116
|
const currentKeys = allStoragedOwnedKeys[namespace] || [];
|
|
117
117
|
const combinedSet = new Set([...currentKeys, ...newOwnedKeys]);
|
|
118
118
|
allStoragedOwnedKeys[namespace] = Array.from(combinedSet);
|
|
119
|
-
}
|
|
119
|
+
}
|
|
120
120
|
|
|
121
121
|
const data = JSON.stringify(allStoragedOwnedKeys);
|
|
122
122
|
await localStorage.setItem(ownershipKey, data, ownershipNamespace);
|
|
@@ -136,18 +136,14 @@ async function removeOwnedKeys({
|
|
|
136
136
|
ownershipNamespace
|
|
137
137
|
);
|
|
138
138
|
|
|
139
|
-
Object.keys(toRemoveKeys)
|
|
139
|
+
for (const namespace of Object.keys(toRemoveKeys)) {
|
|
140
140
|
const keysToRemove: string[] = toRemoveKeys[namespace] || [];
|
|
141
141
|
const currentKeys: string[] = currentKeysList[namespace] || [];
|
|
142
142
|
|
|
143
143
|
const storageOwnedSet = new Set(currentKeys);
|
|
144
144
|
const keysToRemoveSet = new Set(keysToRemove);
|
|
145
145
|
|
|
146
|
-
|
|
147
|
-
toBeRemovedSet.forEach(Set.prototype.delete, originalSet);
|
|
148
|
-
}
|
|
149
|
-
|
|
150
|
-
removeAll(storageOwnedSet, keysToRemoveSet);
|
|
146
|
+
keysToRemoveSet.forEach((key) => storageOwnedSet.delete(key));
|
|
151
147
|
const newLoginKeys = Array.from(storageOwnedSet);
|
|
152
148
|
|
|
153
149
|
if (isNilOrEmpty(newLoginKeys)) {
|
|
@@ -155,7 +151,7 @@ async function removeOwnedKeys({
|
|
|
155
151
|
} else {
|
|
156
152
|
currentKeysList[namespace] = newLoginKeys;
|
|
157
153
|
}
|
|
158
|
-
}
|
|
154
|
+
}
|
|
159
155
|
|
|
160
156
|
if (isNilOrEmpty(currentKeysList)) {
|
|
161
157
|
await localStorage.removeItem(ownershipKey, ownershipNamespace);
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
export const usePipesCacheReset = jest.fn();
|