Skip to content

PWA-1686: [bug]: fix quantity field warning #3399

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Sep 8, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
import { useState, useEffect } from 'react';
import { useFieldState } from 'informed';

const useInformedFieldStateWrapper = field => {
const [isInitialRender, setIsInitialRender] = useState(true);
const warn = console.warn;
// Temporarily override console warn to remove false positive warning from useFieldState
const regex = /^Attempting to get field (.*) but it does not exist$/g;
if (isInitialRender) {
console.warn = err => {
if (!err.match(regex)) {
warn(err);
}
};
}
useEffect(() => {
setIsInitialRender(false);
}, []);
const fieldState = useFieldState(field);
if (isInitialRender) {
console.warn = warn;
}

return fieldState;
};

export default useInformedFieldStateWrapper;
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useCallback, useMemo, useState, useEffect } from 'react';
import { useFieldState, useFieldApi } from 'informed';
import { useFieldApi } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';
import debounce from 'lodash.debounce';

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,11 +43,14 @@ jest.mock('@apollo/client', () => {
};
});

jest.mock('informed', () => {
return {
useFieldState: jest.fn().mockReturnValue({ value: 'braintree' })
};
});
jest.mock(
'@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper',
() => {
return {
useFieldState: jest.fn().mockReturnValue({ value: 'braintree' })
};
}
);

jest.mock('../../CheckoutError', () => {
class CheckoutError extends Error {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,14 @@ import createTestInstance from '../../../../util/createTestInstance';
jest.mock('../../../../context/cart');
useCartContext.mockReturnValue([{ cartId: '123456' }]);

jest.mock('informed', () => {
return {
useFieldState: () => {
return { value: 'currentSelectedPaymentMethod' };
}
};
});
jest.mock(
'@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper',
() => {
return jest.fn().mockReturnValue({
value: 'currentSelectedPaymentMethod'
});
}
);

jest.mock('@apollo/client', () => {
return {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useQuery } from '@apollo/client';
import { useFieldState } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

import { useCartContext } from '../../../context/cart';

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,25 @@
import React from 'react';
import { act } from 'react-test-renderer';
import { useFieldApi, useFieldState } from 'informed';
import { useFieldApi } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

import createTestInstance from '../../../util/createTestInstance';
import { usePostcode } from '../usePostcode';

jest.mock('informed', () => {
const useFieldState = jest.fn().mockReturnValue({
value: 'US'
});
const useFieldApi = jest.fn();

return { useFieldApi, useFieldState };
return { useFieldApi };
});

jest.mock(
'@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper',
() => {
return jest.fn().mockReturnValue({
value: 'US'
});
}
);
const Component = props => {
const talonProps = usePostcode(props);
return <i talonProps={talonProps} />;
Expand Down
3 changes: 2 additions & 1 deletion packages/peregrine/lib/talons/Postcode/usePostcode.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useEffect, useRef } from 'react';
import { useFieldApi, useFieldState } from 'informed';
import { useFieldApi } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

/**
* The usePostcode talon handles logic for resetting the postcode field value when the country changes.
Expand Down
17 changes: 12 additions & 5 deletions packages/peregrine/lib/talons/Region/__tests__/useRegion.spec.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,27 @@
import React from 'react';
import { act } from 'react-test-renderer';
import { useQuery } from '@apollo/client';
import { useFieldApi, useFieldState } from 'informed';
import { useFieldApi } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

import createTestInstance from '../../../util/createTestInstance';
import { useRegion } from '../useRegion';

jest.mock('informed', () => {
const useFieldState = jest.fn().mockReturnValue({
value: 'US'
});
const useFieldApi = jest.fn();

return { useFieldApi, useFieldState };
return { useFieldApi };
});

jest.mock(
'@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper',
() => {
return jest.fn().mockReturnValue({
value: 'US'
});
}
);

jest.mock('@apollo/client', () => ({
useQuery: jest.fn().mockReturnValue({
data: {
Expand Down
3 changes: 2 additions & 1 deletion packages/peregrine/lib/talons/Region/useRegion.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { useEffect, useRef } from 'react';
import { useQuery } from '@apollo/client';
import { useFieldApi, useFieldState } from 'informed';
import { useFieldApi } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

/**
* The useRegion talon handles logic for:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,23 @@
import React, { useEffect } from 'react';
import { Form, Text, useFieldState } from 'informed';
import { Form, Text } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

import { runQuery, useLazyQuery } from '@apollo/client';
import { useAutocomplete } from '../../../talons/SearchBar';
import createTestInstance from '../../../util/createTestInstance';

jest.mock('informed', () => ({
...jest.requireActual('informed'),
useFieldState: jest.fn().mockReturnValue({ value: '' })
...jest.requireActual('informed')
}));

jest.mock(
'@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper',
() => {
return jest.fn().mockReturnValue({
value: ''
});
}
);
jest.mock('@apollo/client', () => {
const runQuery = jest.fn();
const queryResult = {
Expand Down
2 changes: 1 addition & 1 deletion packages/peregrine/lib/talons/SearchBar/useAutocomplete.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { useEffect, useMemo } from 'react';
import { useFieldState } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';
import { useLazyQuery } from '@apollo/client';
import debounce from 'lodash.debounce';

Expand Down
3 changes: 2 additions & 1 deletion packages/peregrine/lib/talons/SearchBar/useSearchField.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { useCallback, useEffect, useRef } from 'react';
import { useFieldState, useFormApi } from 'informed';
import { useFormApi } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

import { getSearchParam } from '@magento/peregrine/lib/hooks/useSearchParam';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ test('exposes all hooks and targets', async () => {
.transformModules.promise(() => {});
expect(apis.hooks).toMatchInlineSnapshot(`
HookInterceptorSet API (autogenerated from "@magento/peregrine/lib/hooks"):
hooks.hook-wrappers.useInformedFieldStateWrapper.wrapWith() wraps export "useInformedFieldStateWrapper" from "hook-wrappers/useInformedFieldStateWrapper.js"
hooks.useAwaitQuery.wrapWith() wraps export "useAwaitQuery" from "useAwaitQuery.js"
hooks.useCarousel.wrapWith() wraps export "useCarousel" from "useCarousel.js"
hooks.useCustomerWishlistSkus.useCustomerWishlistSkus.wrapWith() wraps export "useCustomerWishlistSkus" from "useCustomerWishlistSkus/useCustomerWishlistSkus.js"
Expand Down
7 changes: 2 additions & 5 deletions packages/venia-ui/lib/components/Checkbox/checkbox.js
Original file line number Diff line number Diff line change
@@ -1,10 +1,7 @@
import React, { Fragment, useEffect } from 'react';
import { node, shape, string } from 'prop-types';
import {
Checkbox as InformedCheckbox,
useFieldApi,
useFieldState
} from 'informed';
import { Checkbox as InformedCheckbox, useFieldApi } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

import { useStyle } from '../../classify';
import { Message } from '../Field';
Expand Down
3 changes: 2 additions & 1 deletion packages/venia-ui/lib/components/RadioGroup/radioGroup.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Fragment } from 'react';
import { arrayOf, number, node, oneOfType, shape, string } from 'prop-types';
import { RadioGroup as InformedRadioGroup, useFieldState } from 'informed';
import { RadioGroup as InformedRadioGroup } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

import { useStyle } from '../../classify';
import { Message } from '../Field';
Expand Down
3 changes: 2 additions & 1 deletion packages/venia-ui/lib/components/TextArea/textArea.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Fragment } from 'react';
import { number, node, oneOf, oneOfType, shape, string } from 'prop-types';
import { TextArea as InformedTextArea, useFieldState } from 'informed';
import { TextArea as InformedTextArea } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

import { useStyle } from '../../classify';
import { Message } from '../Field';
Expand Down
3 changes: 2 additions & 1 deletion packages/venia-ui/lib/components/TextInput/textInput.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import React, { Fragment } from 'react';
import { node, shape, string } from 'prop-types';
import { Text as InformedText, useFieldState } from 'informed';
import { Text as InformedText } from 'informed';
import useFieldState from '@magento/peregrine/lib/hooks/hook-wrappers/useInformedFieldStateWrapper';

import { useStyle } from '../../classify';
import { FieldIcons, Message } from '../Field';
Expand Down