Skip to content

Commit a34b287

Browse files
authored
Merge pull request #639 from Expensify/ionatan_missingonyxlogkey
2 parents 5fc78f0 + 583acf0 commit a34b287

2 files changed

Lines changed: 9 additions & 9 deletions

File tree

lib/useOnyx.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -300,7 +300,7 @@ function useOnyx<TKey extends OnyxKey, TReturnValue = OnyxValue<TKey>>(
300300
// we log an alert so it can be acknowledged by the consumer. Additionally, we won't log alerts
301301
// if there's a `Onyx.clear()` task in progress.
302302
if (options?.canBeMissing === false && newStatus === 'loaded' && !isOnyxValueDefined && !OnyxCache.hasPendingTask(TASK.CLEAR)) {
303-
Logger.logAlert(`useOnyx returned no data for key with canBeMissing set to false.`, {key, showAlert: true});
303+
Logger.logAlert(`useOnyx returned no data for key with canBeMissing set to false for key ${key}`, {showAlert: true});
304304
}
305305
}
306306

tests/unit/useOnyxTest.ts

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -752,7 +752,7 @@ describe('useOnyx', () => {
752752

753753
describe('canBeMissing', () => {
754754
let logAlertFn = jest.fn();
755-
const alertMessage = 'useOnyx returned no data for key with canBeMissing set to false.';
755+
const alertMessage = 'useOnyx returned no data for key with canBeMissing set to false for key test';
756756

757757
beforeEach(() => {
758758
logAlertFn = jest.fn();
@@ -806,7 +806,7 @@ describe('useOnyx', () => {
806806
expect(result1.current[0]).toBeUndefined();
807807
expect(result1.current[1].status).toEqual('loaded');
808808
expect(logAlertFn).toHaveBeenCalledTimes(1);
809-
expect(logAlertFn).toHaveBeenNthCalledWith(1, alertMessage, {key: ONYXKEYS.TEST_KEY, showAlert: true});
809+
expect(logAlertFn).toHaveBeenNthCalledWith(1, alertMessage, {showAlert: true});
810810

811811
await act(async () => Onyx.set(ONYXKEYS.TEST_KEY, 'test'));
812812

@@ -816,7 +816,7 @@ describe('useOnyx', () => {
816816

817817
expect(result1.current[0]).toBeUndefined();
818818
expect(logAlertFn).toHaveBeenCalledTimes(2);
819-
expect(logAlertFn).toHaveBeenNthCalledWith(2, alertMessage, {key: ONYXKEYS.TEST_KEY, showAlert: true});
819+
expect(logAlertFn).toHaveBeenNthCalledWith(2, alertMessage, {showAlert: true});
820820
});
821821

822822
it('should log an alert if Onyx doesn\'t return selected data in loaded state and "canBeMissing" property is false', async () => {
@@ -837,7 +837,7 @@ describe('useOnyx', () => {
837837
expect(result1.current[0]).toBeUndefined();
838838
expect(result1.current[1].status).toEqual('loaded');
839839
expect(logAlertFn).toHaveBeenCalledTimes(1);
840-
expect(logAlertFn).toHaveBeenNthCalledWith(1, alertMessage, {key: ONYXKEYS.TEST_KEY, showAlert: true});
840+
expect(logAlertFn).toHaveBeenNthCalledWith(1, alertMessage, {showAlert: true});
841841

842842
await act(async () => Onyx.set(ONYXKEYS.TEST_KEY, 'test'));
843843

@@ -847,7 +847,7 @@ describe('useOnyx', () => {
847847

848848
expect(result1.current[0]).toBeUndefined();
849849
expect(logAlertFn).toHaveBeenCalledTimes(2);
850-
expect(logAlertFn).toHaveBeenNthCalledWith(2, alertMessage, {key: ONYXKEYS.TEST_KEY, showAlert: true});
850+
expect(logAlertFn).toHaveBeenNthCalledWith(2, alertMessage, {showAlert: true});
851851
});
852852

853853
it('should log an alert if Onyx doesn\'t return data but there is a selector that always return something and "canBeMissing" property is false', async () => {
@@ -865,7 +865,7 @@ describe('useOnyx', () => {
865865
expect(result1.current[0]).toBe('undefined_changed');
866866
expect(result1.current[1].status).toEqual('loaded');
867867
expect(logAlertFn).toHaveBeenCalledTimes(1);
868-
expect(logAlertFn).toHaveBeenNthCalledWith(1, alertMessage, {key: ONYXKEYS.TEST_KEY, showAlert: true});
868+
expect(logAlertFn).toHaveBeenNthCalledWith(1, alertMessage, {showAlert: true});
869869

870870
await act(async () => Onyx.set(ONYXKEYS.TEST_KEY, 'test'));
871871

@@ -875,7 +875,7 @@ describe('useOnyx', () => {
875875

876876
expect(result1.current[0]).toBe('undefined_changed');
877877
expect(logAlertFn).toHaveBeenCalledTimes(2);
878-
expect(logAlertFn).toHaveBeenNthCalledWith(2, alertMessage, {key: ONYXKEYS.TEST_KEY, showAlert: true});
878+
expect(logAlertFn).toHaveBeenNthCalledWith(2, alertMessage, {showAlert: true});
879879
});
880880

881881
it('should not log an alert if "canBeMissing" property is false but there is a Onyx.clear() task in progress', async () => {
@@ -890,7 +890,7 @@ describe('useOnyx', () => {
890890
expect(result1.current[0]).toBeUndefined();
891891
expect(result1.current[1].status).toEqual('loaded');
892892
expect(logAlertFn).toHaveBeenCalledTimes(1);
893-
expect(logAlertFn).toHaveBeenNthCalledWith(1, alertMessage, {key: ONYXKEYS.TEST_KEY, showAlert: true});
893+
expect(logAlertFn).toHaveBeenNthCalledWith(1, alertMessage, {showAlert: true});
894894

895895
await act(async () => Onyx.set(ONYXKEYS.TEST_KEY, 'test'));
896896

0 commit comments

Comments
 (0)