@simplybusiness/mobius 3.2.3 → 3.3.0
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/CHANGELOG.md +7 -0
- package/dist/cjs/components/Chopin/TradeSelector/TradeSelector.d.ts +1 -0
- package/dist/cjs/components/Chopin/TradeSelector/TradeSelector.js +2 -1
- package/dist/cjs/components/Chopin/TradeSelector/TradeSelector.js.map +1 -1
- package/dist/cjs/components/Chopin/TradeSelector/types.d.ts +1 -0
- package/dist/cjs/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.d.ts +1 -1
- package/dist/cjs/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.js +16 -4
- package/dist/cjs/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.js.map +1 -1
- package/dist/cjs/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.test.d.ts +1 -0
- package/dist/cjs/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.test.js +86 -0
- package/dist/cjs/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.test.js.map +1 -0
- package/dist/esm/components/Chopin/TradeSelector/TradeSelector.js +2 -1
- package/dist/esm/components/Chopin/TradeSelector/TradeSelector.js.map +1 -1
- package/dist/esm/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.js +16 -4
- package/dist/esm/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.js.map +1 -1
- package/dist/esm/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.test.js +84 -0
- package/dist/esm/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.test.js.map +1 -0
- package/dist/mobius.d.ts +2 -0
- package/package.json +1 -1
- package/src/components/Chopin/TradeSelector/TradeSelector.story.mdx +22 -0
- package/src/components/Chopin/TradeSelector/TradeSelector.tsx +3 -0
- package/src/components/Chopin/TradeSelector/types.ts +1 -0
- package/src/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.test.ts +107 -0
- package/src/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.ts +18 -3
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file, or link in
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
6
6
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
+
## [3.3.0] - 2023-01-23
|
|
9
|
+
|
|
10
|
+
### Added
|
|
11
|
+
|
|
12
|
+
- Add ability to have selected trade on initial render in Trade Selector
|
|
13
|
+
|
|
8
14
|
## [3.2.3] - 2023-01-11
|
|
9
15
|
|
|
10
16
|
## Changed
|
|
@@ -148,6 +154,7 @@ Additionally, mobius and themes are available on the public NPM registry and can
|
|
|
148
154
|
|
|
149
155
|
## Github Links
|
|
150
156
|
|
|
157
|
+
[3.3.0]: https://github.com/simplybusiness/mobius/releases/tag/v3.3.0
|
|
151
158
|
[3.2.3]: https://github.com/simplybusiness/mobius/releases/tag/v3.2.3
|
|
152
159
|
[3.2.2]: https://github.com/simplybusiness/mobius/releases/tag/v3.2.2
|
|
153
160
|
[3.2.1]: https://github.com/simplybusiness/mobius/releases/tag/v3.2.1
|
|
@@ -14,6 +14,7 @@ export interface TradeSelectorProps extends DOMProps, RefAttributes<TradeSelecto
|
|
|
14
14
|
urls?: UrlProps;
|
|
15
15
|
onTradeSelected?: (trade: TradeProps) => void;
|
|
16
16
|
hideLabel?: boolean;
|
|
17
|
+
initialTrade?: TradeProps;
|
|
17
18
|
}
|
|
18
19
|
export type TradeSelectorRef = Ref<TradeSelectorElementType>;
|
|
19
20
|
declare const TradeSelector: ForwardedRefComponent<TradeSelectorProps, TradeSelectorElementType>;
|
|
@@ -20,7 +20,7 @@ const Label_1 = require("../../Label");
|
|
|
20
20
|
const Text_1 = require("../../Text");
|
|
21
21
|
exports.ERROR_MESSAGE_SERVICE_UNAVAIALBLE = "The service is currently unavailable. Please try again later";
|
|
22
22
|
const TradeSelector = (0, react_1.forwardRef)((props, ref) => {
|
|
23
|
-
const { elementType: Element = "div", minInput = 3, apiRequestDebounceInMs = 250, urls, labels, className, onTradeSelected, hideLabel, } = props;
|
|
23
|
+
const { elementType: Element = "div", minInput = 3, apiRequestDebounceInMs = 250, urls, labels, className, onTradeSelected, hideLabel, initialTrade, } = props;
|
|
24
24
|
const fieldLabels = Object.assign({ input: "What is your specific trade/profession?", description: "", exact: "Exact matches for your search", placeholder: "e.g. Cleaner, builder, consultant", suggested: "Suggested matches for your search", noResults: "View all trades", loading: "Loading..." }, labels);
|
|
25
25
|
const { site, baseUrl } = (0, config_1.getConfig)();
|
|
26
26
|
const links = (0, react_1.useMemo)(() => (Object.assign({ quoteRedirect: site, tradeApi: baseUrl, allOccupations: "https://quote.simplybusiness.co.uk/trades?vertical=business" }, urls)), [site, baseUrl, urls]);
|
|
@@ -29,6 +29,7 @@ const TradeSelector = (0, react_1.forwardRef)((props, ref) => {
|
|
|
29
29
|
apiRequestDebounceInMs,
|
|
30
30
|
urls: links,
|
|
31
31
|
onTradeSelected,
|
|
32
|
+
initialTrade,
|
|
32
33
|
});
|
|
33
34
|
const classes = (0, clsx_1.default)("chopin", "chopin/TradeSelector", className);
|
|
34
35
|
const errorMessage = error === null || error === void 0 ? void 0 : error.message;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TradeSelector.js","sourceRoot":"","sources":["../../../../../src/components/Chopin/TradeSelector/TradeSelector.tsx"],"names":[],"mappings":";;;;;;;AAAA,iCAAgE;AAEhE,gDAAwB;AACxB,6CAA8C;AAC9C,6CAA6C;AAE7C,qCAAqC;AACrC,mDAAgD;AAChD,mDAAgD;AAChD,yDAAsD;AACtD,2DAAwD;AAExD,qDAAkD;AAClD,0EAAuE;AACvE,uCAAoC;AACpC,qCAAkC;AAIrB,QAAA,iCAAiC,GAC5C,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"TradeSelector.js","sourceRoot":"","sources":["../../../../../src/components/Chopin/TradeSelector/TradeSelector.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import { Key } from "react";
|
|
2
2
|
import type { TradeProps, useTradeSelectorProps } from "..";
|
|
3
3
|
declare const useTradeSelector: {
|
|
4
|
-
({ minInput, urls, onTradeSelected, }: useTradeSelectorProps): {
|
|
4
|
+
({ minInput, urls, onTradeSelected, initialTrade, }: useTradeSelectorProps): {
|
|
5
5
|
inputValue: string;
|
|
6
6
|
isLoading: boolean;
|
|
7
7
|
trades: TradeProps[];
|
|
@@ -3,18 +3,25 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.useTradeSelector = void 0;
|
|
4
4
|
const react_1 = require("react");
|
|
5
5
|
const data_1 = require("@react-stately/data");
|
|
6
|
-
const
|
|
6
|
+
const formattedTrades = (trades = []) => ({
|
|
7
|
+
items: Array.isArray(trades) ? trades : [trades],
|
|
8
|
+
});
|
|
9
|
+
const useTradeSelector = ({ minInput, urls, onTradeSelected, initialTrade, }) => {
|
|
7
10
|
const [userInput, setUserInput] = (0, react_1.useState)("");
|
|
8
|
-
const [selectedTrade, setSelectedTrade] = (0, react_1.useState)(
|
|
11
|
+
const [selectedTrade, setSelectedTrade] = (0, react_1.useState)(initialTrade);
|
|
9
12
|
const [hasUserChangedMind, setHasUserChangedMind] = (0, react_1.useState)(false);
|
|
10
13
|
const endpoint = `${urls.tradeApi}?q=${encodeURIComponent(userInput)}&site=${urls.quoteRedirect}`;
|
|
11
14
|
const list = (0, data_1.useAsyncList)({
|
|
12
15
|
async load({ signal }) {
|
|
16
|
+
if (userInput.length === 0)
|
|
17
|
+
return formattedTrades();
|
|
18
|
+
if (initialTrade && userInput.length === 0)
|
|
19
|
+
formattedTrades(initialTrade);
|
|
13
20
|
const response = await fetch(endpoint, {
|
|
14
21
|
signal,
|
|
15
22
|
});
|
|
16
23
|
const json = await response.json();
|
|
17
|
-
return
|
|
24
|
+
return formattedTrades(json.results);
|
|
18
25
|
},
|
|
19
26
|
});
|
|
20
27
|
const handleSelectionChange = (value) => {
|
|
@@ -33,7 +40,12 @@ const useTradeSelector = ({ minInput, urls, onTradeSelected, }) => {
|
|
|
33
40
|
}
|
|
34
41
|
}
|
|
35
42
|
};
|
|
36
|
-
const handleUserChangedMind = () =>
|
|
43
|
+
const handleUserChangedMind = () => {
|
|
44
|
+
if (initialTrade) {
|
|
45
|
+
setUserInput(initialTrade.value);
|
|
46
|
+
}
|
|
47
|
+
setHasUserChangedMind(true);
|
|
48
|
+
};
|
|
37
49
|
(0, react_1.useEffect)(() => {
|
|
38
50
|
if (userInput.length >= minInput)
|
|
39
51
|
list.reload();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTradeSelector.js","sourceRoot":"","sources":["../../../../../../src/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.ts"],"names":[],"mappings":";;;AAAA,iCAAiD;AACjD,8CAAmD;AAGnD,MAAM,gBAAgB,GAAG,CAAC,EACxB,QAAQ,EACR,IAAI,EACJ,eAAe,
|
|
1
|
+
{"version":3,"file":"useTradeSelector.js","sourceRoot":"","sources":["../../../../../../src/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export {};
|
|
@@ -0,0 +1,86 @@
|
|
|
1
|
+
"use strict";
|
|
2
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
+
const react_1 = require("@testing-library/react");
|
|
4
|
+
const useTradeSelector_1 = require("./useTradeSelector");
|
|
5
|
+
const trade = {
|
|
6
|
+
value: "Builder",
|
|
7
|
+
vertical: "business",
|
|
8
|
+
supported_verticals: ["contractors_combined"],
|
|
9
|
+
label: "<strong>Builder</strong>",
|
|
10
|
+
type: "exact",
|
|
11
|
+
trade_detail: null,
|
|
12
|
+
trade_type: null,
|
|
13
|
+
blocked: false,
|
|
14
|
+
};
|
|
15
|
+
let fetchMock;
|
|
16
|
+
global.fetch = jest.fn(() => Promise.resolve({
|
|
17
|
+
json: () => Promise.resolve({
|
|
18
|
+
items: [],
|
|
19
|
+
}),
|
|
20
|
+
}));
|
|
21
|
+
describe("useTradeSelector", () => {
|
|
22
|
+
beforeEach(() => {
|
|
23
|
+
fetchMock = jest.spyOn(global, "fetch");
|
|
24
|
+
});
|
|
25
|
+
afterEach(() => {
|
|
26
|
+
jest.restoreAllMocks();
|
|
27
|
+
});
|
|
28
|
+
describe("with no initial trade provided", () => {
|
|
29
|
+
it("should not call the API on initial render", async () => {
|
|
30
|
+
const { result } = (0, react_1.renderHook)(() => (0, useTradeSelector_1.useTradeSelector)({
|
|
31
|
+
minInput: 3,
|
|
32
|
+
apiRequestDebounceInMs: 250,
|
|
33
|
+
urls: {
|
|
34
|
+
quoteRedirect: "redirect-link",
|
|
35
|
+
tradeApi: "trade-api-link",
|
|
36
|
+
allOccupations: "https://quote.simplybusiness.co.uk/trades?vertical=business",
|
|
37
|
+
},
|
|
38
|
+
}));
|
|
39
|
+
await (0, react_1.waitFor)(() => {
|
|
40
|
+
expect(result.current.isLoading).toBeFalsy();
|
|
41
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
42
|
+
});
|
|
43
|
+
});
|
|
44
|
+
});
|
|
45
|
+
describe("with initial trade provided", () => {
|
|
46
|
+
it("should not call the API on initial render", async () => {
|
|
47
|
+
const { result } = (0, react_1.renderHook)(() => (0, useTradeSelector_1.useTradeSelector)({
|
|
48
|
+
minInput: 3,
|
|
49
|
+
apiRequestDebounceInMs: 250,
|
|
50
|
+
urls: {
|
|
51
|
+
quoteRedirect: "redirect-link",
|
|
52
|
+
tradeApi: "trade-api-link",
|
|
53
|
+
allOccupations: "https://quote.simplybusiness.co.uk/trades?vertical=business",
|
|
54
|
+
},
|
|
55
|
+
initialTrade: trade,
|
|
56
|
+
}));
|
|
57
|
+
await (0, react_1.waitFor)(() => {
|
|
58
|
+
expect(result.current.isLoading).toBeFalsy();
|
|
59
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
60
|
+
});
|
|
61
|
+
});
|
|
62
|
+
});
|
|
63
|
+
describe("with user input set above minimum length", () => {
|
|
64
|
+
it("should call the API", async () => {
|
|
65
|
+
const quoteRedirect = "redirect-link";
|
|
66
|
+
const tradeApi = "trade-api-link";
|
|
67
|
+
const userInput = "Cleaner";
|
|
68
|
+
const link = `${tradeApi}?q=${userInput}&site=${quoteRedirect}`;
|
|
69
|
+
const AbortSignalMock = expect.anything();
|
|
70
|
+
const { result } = (0, react_1.renderHook)(() => (0, useTradeSelector_1.useTradeSelector)({
|
|
71
|
+
minInput: 3,
|
|
72
|
+
apiRequestDebounceInMs: 250,
|
|
73
|
+
urls: {
|
|
74
|
+
quoteRedirect: "redirect-link",
|
|
75
|
+
tradeApi: "trade-api-link",
|
|
76
|
+
allOccupations: "https://quote.simplybusiness.co.uk/trades?vertical=business",
|
|
77
|
+
},
|
|
78
|
+
}));
|
|
79
|
+
await (0, react_1.waitFor)(() => {
|
|
80
|
+
result.current.onInputChange(userInput);
|
|
81
|
+
expect(fetchMock).toHaveBeenCalledWith(link, AbortSignalMock);
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
});
|
|
85
|
+
});
|
|
86
|
+
//# sourceMappingURL=useTradeSelector.test.js.map
|
package/dist/cjs/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.test.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useTradeSelector.test.js","sourceRoot":"","sources":["../../../../../../src/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,7 +14,7 @@ import { Label } from "../../Label";
|
|
|
14
14
|
import { Text } from "../../Text";
|
|
15
15
|
export const ERROR_MESSAGE_SERVICE_UNAVAIALBLE = "The service is currently unavailable. Please try again later";
|
|
16
16
|
const TradeSelector = forwardRef((props, ref) => {
|
|
17
|
-
const { elementType: Element = "div", minInput = 3, apiRequestDebounceInMs = 250, urls, labels, className, onTradeSelected, hideLabel, } = props;
|
|
17
|
+
const { elementType: Element = "div", minInput = 3, apiRequestDebounceInMs = 250, urls, labels, className, onTradeSelected, hideLabel, initialTrade, } = props;
|
|
18
18
|
const fieldLabels = Object.assign({ input: "What is your specific trade/profession?", description: "", exact: "Exact matches for your search", placeholder: "e.g. Cleaner, builder, consultant", suggested: "Suggested matches for your search", noResults: "View all trades", loading: "Loading..." }, labels);
|
|
19
19
|
const { site, baseUrl } = getConfig();
|
|
20
20
|
const links = useMemo(() => (Object.assign({ quoteRedirect: site, tradeApi: baseUrl, allOccupations: "https://quote.simplybusiness.co.uk/trades?vertical=business" }, urls)), [site, baseUrl, urls]);
|
|
@@ -23,6 +23,7 @@ const TradeSelector = forwardRef((props, ref) => {
|
|
|
23
23
|
apiRequestDebounceInMs,
|
|
24
24
|
urls: links,
|
|
25
25
|
onTradeSelected,
|
|
26
|
+
initialTrade,
|
|
26
27
|
});
|
|
27
28
|
const classes = clsx("chopin", "chopin/TradeSelector", className);
|
|
28
29
|
const errorMessage = error === null || error === void 0 ? void 0 : error.message;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"TradeSelector.js","sourceRoot":"","sources":["../../../../../src/components/Chopin/TradeSelector/TradeSelector.tsx"],"names":[],"mappings":";AAAA,OAAO,EAAO,UAAU,EAAiB,OAAO,EAAE,MAAM,OAAO,CAAC;AAEhE,OAAO,IAAI,MAAM,MAAM,CAAC;AACxB,OAAO,EAAE,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAC9C,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAChD,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AAExD,OAAO,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAClD,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AACpC,OAAO,EAAE,IAAI,EAAE,MAAM,YAAY,CAAC;AAIlC,MAAM,CAAC,MAAM,iCAAiC,GAC5C,8DAA8D,CAAC;
|
|
1
|
+
{"version":3,"file":"TradeSelector.js","sourceRoot":"","sources":["../../../../../src/components/Chopin/TradeSelector/TradeSelector.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,17 +1,24 @@
|
|
|
1
1
|
import { useState, useEffect } from "react";
|
|
2
2
|
import { useAsyncList } from "@react-stately/data";
|
|
3
|
-
const
|
|
3
|
+
const formattedTrades = (trades = []) => ({
|
|
4
|
+
items: Array.isArray(trades) ? trades : [trades],
|
|
5
|
+
});
|
|
6
|
+
const useTradeSelector = ({ minInput, urls, onTradeSelected, initialTrade, }) => {
|
|
4
7
|
const [userInput, setUserInput] = useState("");
|
|
5
|
-
const [selectedTrade, setSelectedTrade] = useState(
|
|
8
|
+
const [selectedTrade, setSelectedTrade] = useState(initialTrade);
|
|
6
9
|
const [hasUserChangedMind, setHasUserChangedMind] = useState(false);
|
|
7
10
|
const endpoint = `${urls.tradeApi}?q=${encodeURIComponent(userInput)}&site=${urls.quoteRedirect}`;
|
|
8
11
|
const list = useAsyncList({
|
|
9
12
|
async load({ signal }) {
|
|
13
|
+
if (userInput.length === 0)
|
|
14
|
+
return formattedTrades();
|
|
15
|
+
if (initialTrade && userInput.length === 0)
|
|
16
|
+
formattedTrades(initialTrade);
|
|
10
17
|
const response = await fetch(endpoint, {
|
|
11
18
|
signal,
|
|
12
19
|
});
|
|
13
20
|
const json = await response.json();
|
|
14
|
-
return
|
|
21
|
+
return formattedTrades(json.results);
|
|
15
22
|
},
|
|
16
23
|
});
|
|
17
24
|
const handleSelectionChange = (value) => {
|
|
@@ -30,7 +37,12 @@ const useTradeSelector = ({ minInput, urls, onTradeSelected, }) => {
|
|
|
30
37
|
}
|
|
31
38
|
}
|
|
32
39
|
};
|
|
33
|
-
const handleUserChangedMind = () =>
|
|
40
|
+
const handleUserChangedMind = () => {
|
|
41
|
+
if (initialTrade) {
|
|
42
|
+
setUserInput(initialTrade.value);
|
|
43
|
+
}
|
|
44
|
+
setHasUserChangedMind(true);
|
|
45
|
+
};
|
|
34
46
|
useEffect(() => {
|
|
35
47
|
if (userInput.length >= minInput)
|
|
36
48
|
list.reload();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"useTradeSelector.js","sourceRoot":"","sources":["../../../../../../src/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,SAAS,EAAO,MAAM,OAAO,CAAC;AACjD,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAC;AAGnD,MAAM,gBAAgB,GAAG,CAAC,EACxB,QAAQ,EACR,IAAI,EACJ,eAAe,
|
|
1
|
+
{"version":3,"file":"useTradeSelector.js","sourceRoot":"","sources":["../../../../../../src/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,84 @@
|
|
|
1
|
+
import { renderHook, waitFor } from "@testing-library/react";
|
|
2
|
+
import { useTradeSelector } from "./useTradeSelector";
|
|
3
|
+
const trade = {
|
|
4
|
+
value: "Builder",
|
|
5
|
+
vertical: "business",
|
|
6
|
+
supported_verticals: ["contractors_combined"],
|
|
7
|
+
label: "<strong>Builder</strong>",
|
|
8
|
+
type: "exact",
|
|
9
|
+
trade_detail: null,
|
|
10
|
+
trade_type: null,
|
|
11
|
+
blocked: false,
|
|
12
|
+
};
|
|
13
|
+
let fetchMock;
|
|
14
|
+
global.fetch = jest.fn(() => Promise.resolve({
|
|
15
|
+
json: () => Promise.resolve({
|
|
16
|
+
items: [],
|
|
17
|
+
}),
|
|
18
|
+
}));
|
|
19
|
+
describe("useTradeSelector", () => {
|
|
20
|
+
beforeEach(() => {
|
|
21
|
+
fetchMock = jest.spyOn(global, "fetch");
|
|
22
|
+
});
|
|
23
|
+
afterEach(() => {
|
|
24
|
+
jest.restoreAllMocks();
|
|
25
|
+
});
|
|
26
|
+
describe("with no initial trade provided", () => {
|
|
27
|
+
it("should not call the API on initial render", async () => {
|
|
28
|
+
const { result } = renderHook(() => useTradeSelector({
|
|
29
|
+
minInput: 3,
|
|
30
|
+
apiRequestDebounceInMs: 250,
|
|
31
|
+
urls: {
|
|
32
|
+
quoteRedirect: "redirect-link",
|
|
33
|
+
tradeApi: "trade-api-link",
|
|
34
|
+
allOccupations: "https://quote.simplybusiness.co.uk/trades?vertical=business",
|
|
35
|
+
},
|
|
36
|
+
}));
|
|
37
|
+
await waitFor(() => {
|
|
38
|
+
expect(result.current.isLoading).toBeFalsy();
|
|
39
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
40
|
+
});
|
|
41
|
+
});
|
|
42
|
+
});
|
|
43
|
+
describe("with initial trade provided", () => {
|
|
44
|
+
it("should not call the API on initial render", async () => {
|
|
45
|
+
const { result } = renderHook(() => useTradeSelector({
|
|
46
|
+
minInput: 3,
|
|
47
|
+
apiRequestDebounceInMs: 250,
|
|
48
|
+
urls: {
|
|
49
|
+
quoteRedirect: "redirect-link",
|
|
50
|
+
tradeApi: "trade-api-link",
|
|
51
|
+
allOccupations: "https://quote.simplybusiness.co.uk/trades?vertical=business",
|
|
52
|
+
},
|
|
53
|
+
initialTrade: trade,
|
|
54
|
+
}));
|
|
55
|
+
await waitFor(() => {
|
|
56
|
+
expect(result.current.isLoading).toBeFalsy();
|
|
57
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
58
|
+
});
|
|
59
|
+
});
|
|
60
|
+
});
|
|
61
|
+
describe("with user input set above minimum length", () => {
|
|
62
|
+
it("should call the API", async () => {
|
|
63
|
+
const quoteRedirect = "redirect-link";
|
|
64
|
+
const tradeApi = "trade-api-link";
|
|
65
|
+
const userInput = "Cleaner";
|
|
66
|
+
const link = `${tradeApi}?q=${userInput}&site=${quoteRedirect}`;
|
|
67
|
+
const AbortSignalMock = expect.anything();
|
|
68
|
+
const { result } = renderHook(() => useTradeSelector({
|
|
69
|
+
minInput: 3,
|
|
70
|
+
apiRequestDebounceInMs: 250,
|
|
71
|
+
urls: {
|
|
72
|
+
quoteRedirect: "redirect-link",
|
|
73
|
+
tradeApi: "trade-api-link",
|
|
74
|
+
allOccupations: "https://quote.simplybusiness.co.uk/trades?vertical=business",
|
|
75
|
+
},
|
|
76
|
+
}));
|
|
77
|
+
await waitFor(() => {
|
|
78
|
+
result.current.onInputChange(userInput);
|
|
79
|
+
expect(fetchMock).toHaveBeenCalledWith(link, AbortSignalMock);
|
|
80
|
+
});
|
|
81
|
+
});
|
|
82
|
+
});
|
|
83
|
+
});
|
|
84
|
+
//# sourceMappingURL=useTradeSelector.test.js.map
|
package/dist/esm/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.test.js.map
ADDED
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"useTradeSelector.test.js","sourceRoot":"","sources":["../../../../../../src/components/Chopin/TradeSelector/useTradeSelector/useTradeSelector.test.ts"],"names":[],"mappings":"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"}
|
package/dist/mobius.d.ts
CHANGED
|
@@ -1187,6 +1187,7 @@ declare interface TradeSelectorProps extends DOMProps, RefAttributes<TradeSelect
|
|
|
1187
1187
|
urls?: UrlProps;
|
|
1188
1188
|
onTradeSelected?: (trade: TradeProps) => void;
|
|
1189
1189
|
hideLabel?: boolean;
|
|
1190
|
+
initialTrade?: TradeProps;
|
|
1190
1191
|
}
|
|
1191
1192
|
|
|
1192
1193
|
declare type TradeSelectorRef = Ref<TradeSelectorElementType>;
|
|
@@ -1209,6 +1210,7 @@ declare type useTradeSelectorProps = {
|
|
|
1209
1210
|
apiRequestDebounceInMs: number;
|
|
1210
1211
|
urls: UrlProps;
|
|
1211
1212
|
onTradeSelected?: (trade: TradeProps) => void;
|
|
1213
|
+
initialTrade?: TradeProps;
|
|
1212
1214
|
};
|
|
1213
1215
|
|
|
1214
1216
|
export { useVisuallyHidden }
|
package/package.json
CHANGED
|
@@ -59,6 +59,28 @@ import { Chopin } from "@simplybusiness/mobius";
|
|
|
59
59
|
<Chopin.TradeSelector />
|
|
60
60
|
```
|
|
61
61
|
|
|
62
|
+
## With Trade
|
|
63
|
+
|
|
64
|
+
<Story
|
|
65
|
+
name="With Trade"
|
|
66
|
+
args={{
|
|
67
|
+
minInput: 3,
|
|
68
|
+
apiRequestDebounceInMs: 250,
|
|
69
|
+
initialTrade: {
|
|
70
|
+
value: "Landlord",
|
|
71
|
+
},
|
|
72
|
+
}}
|
|
73
|
+
>
|
|
74
|
+
{args => <TradeSelector {...args} />}
|
|
75
|
+
</Story>
|
|
76
|
+
|
|
77
|
+
<!-- prettier-ignore -->
|
|
78
|
+
```jsx
|
|
79
|
+
import { Chopin } from "@simplybusiness/mobius";
|
|
80
|
+
|
|
81
|
+
<Chopin.TradeSelector />
|
|
82
|
+
```
|
|
83
|
+
|
|
62
84
|
## Labels
|
|
63
85
|
|
|
64
86
|
The component has a predefined list of labels:
|
|
@@ -31,6 +31,7 @@ export interface TradeSelectorProps
|
|
|
31
31
|
urls?: UrlProps;
|
|
32
32
|
onTradeSelected?: (trade: TradeProps) => void;
|
|
33
33
|
hideLabel?: boolean;
|
|
34
|
+
initialTrade?: TradeProps;
|
|
34
35
|
}
|
|
35
36
|
|
|
36
37
|
export type TradeSelectorRef = Ref<TradeSelectorElementType>;
|
|
@@ -48,6 +49,7 @@ const TradeSelector: ForwardedRefComponent<
|
|
|
48
49
|
className,
|
|
49
50
|
onTradeSelected,
|
|
50
51
|
hideLabel,
|
|
52
|
+
initialTrade,
|
|
51
53
|
} = props;
|
|
52
54
|
|
|
53
55
|
const fieldLabels = {
|
|
@@ -89,6 +91,7 @@ const TradeSelector: ForwardedRefComponent<
|
|
|
89
91
|
apiRequestDebounceInMs,
|
|
90
92
|
urls: links,
|
|
91
93
|
onTradeSelected,
|
|
94
|
+
initialTrade,
|
|
92
95
|
});
|
|
93
96
|
|
|
94
97
|
const classes = clsx("chopin", "chopin/TradeSelector", className);
|
|
@@ -0,0 +1,107 @@
|
|
|
1
|
+
import { renderHook, waitFor } from "@testing-library/react";
|
|
2
|
+
import { useTradeSelector } from "./useTradeSelector";
|
|
3
|
+
|
|
4
|
+
const trade = {
|
|
5
|
+
value: "Builder",
|
|
6
|
+
vertical: "business",
|
|
7
|
+
supported_verticals: ["contractors_combined"],
|
|
8
|
+
label: "<strong>Builder</strong>",
|
|
9
|
+
type: "exact",
|
|
10
|
+
trade_detail: null,
|
|
11
|
+
trade_type: null,
|
|
12
|
+
blocked: false,
|
|
13
|
+
};
|
|
14
|
+
|
|
15
|
+
let fetchMock: any;
|
|
16
|
+
|
|
17
|
+
global.fetch = jest.fn(() =>
|
|
18
|
+
Promise.resolve({
|
|
19
|
+
json: () =>
|
|
20
|
+
Promise.resolve({
|
|
21
|
+
items: [],
|
|
22
|
+
}),
|
|
23
|
+
}),
|
|
24
|
+
) as jest.Mock;
|
|
25
|
+
|
|
26
|
+
describe("useTradeSelector", () => {
|
|
27
|
+
beforeEach(() => {
|
|
28
|
+
fetchMock = jest.spyOn(global, "fetch");
|
|
29
|
+
});
|
|
30
|
+
|
|
31
|
+
afterEach(() => {
|
|
32
|
+
jest.restoreAllMocks();
|
|
33
|
+
});
|
|
34
|
+
|
|
35
|
+
describe("with no initial trade provided", () => {
|
|
36
|
+
it("should not call the API on initial render", async () => {
|
|
37
|
+
const { result } = renderHook(() =>
|
|
38
|
+
useTradeSelector({
|
|
39
|
+
minInput: 3,
|
|
40
|
+
apiRequestDebounceInMs: 250,
|
|
41
|
+
urls: {
|
|
42
|
+
quoteRedirect: "redirect-link",
|
|
43
|
+
tradeApi: "trade-api-link",
|
|
44
|
+
allOccupations:
|
|
45
|
+
"https://quote.simplybusiness.co.uk/trades?vertical=business",
|
|
46
|
+
},
|
|
47
|
+
}),
|
|
48
|
+
);
|
|
49
|
+
|
|
50
|
+
await waitFor(() => {
|
|
51
|
+
expect(result.current.isLoading).toBeFalsy();
|
|
52
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
53
|
+
});
|
|
54
|
+
});
|
|
55
|
+
});
|
|
56
|
+
|
|
57
|
+
describe("with initial trade provided", () => {
|
|
58
|
+
it("should not call the API on initial render", async () => {
|
|
59
|
+
const { result } = renderHook(() =>
|
|
60
|
+
useTradeSelector({
|
|
61
|
+
minInput: 3,
|
|
62
|
+
apiRequestDebounceInMs: 250,
|
|
63
|
+
urls: {
|
|
64
|
+
quoteRedirect: "redirect-link",
|
|
65
|
+
tradeApi: "trade-api-link",
|
|
66
|
+
allOccupations:
|
|
67
|
+
"https://quote.simplybusiness.co.uk/trades?vertical=business",
|
|
68
|
+
},
|
|
69
|
+
initialTrade: trade,
|
|
70
|
+
}),
|
|
71
|
+
);
|
|
72
|
+
|
|
73
|
+
await waitFor(() => {
|
|
74
|
+
expect(result.current.isLoading).toBeFalsy();
|
|
75
|
+
expect(fetchMock).not.toHaveBeenCalled();
|
|
76
|
+
});
|
|
77
|
+
});
|
|
78
|
+
});
|
|
79
|
+
|
|
80
|
+
describe("with user input set above minimum length", () => {
|
|
81
|
+
it("should call the API", async () => {
|
|
82
|
+
const quoteRedirect = "redirect-link";
|
|
83
|
+
const tradeApi = "trade-api-link";
|
|
84
|
+
const userInput = "Cleaner";
|
|
85
|
+
const link = `${tradeApi}?q=${userInput}&site=${quoteRedirect}`;
|
|
86
|
+
const AbortSignalMock = expect.anything();
|
|
87
|
+
|
|
88
|
+
const { result } = renderHook(() =>
|
|
89
|
+
useTradeSelector({
|
|
90
|
+
minInput: 3,
|
|
91
|
+
apiRequestDebounceInMs: 250,
|
|
92
|
+
urls: {
|
|
93
|
+
quoteRedirect: "redirect-link",
|
|
94
|
+
tradeApi: "trade-api-link",
|
|
95
|
+
allOccupations:
|
|
96
|
+
"https://quote.simplybusiness.co.uk/trades?vertical=business",
|
|
97
|
+
},
|
|
98
|
+
}),
|
|
99
|
+
);
|
|
100
|
+
|
|
101
|
+
await waitFor(() => {
|
|
102
|
+
result.current.onInputChange(userInput);
|
|
103
|
+
expect(fetchMock).toHaveBeenCalledWith(link, AbortSignalMock);
|
|
104
|
+
});
|
|
105
|
+
});
|
|
106
|
+
});
|
|
107
|
+
});
|
|
@@ -2,14 +2,19 @@ import { useState, useEffect, Key } from "react";
|
|
|
2
2
|
import { useAsyncList } from "@react-stately/data";
|
|
3
3
|
import type { TradeProps, useTradeSelectorProps } from "..";
|
|
4
4
|
|
|
5
|
+
const formattedTrades = (trades: TradeProps[] | TradeProps = []) => ({
|
|
6
|
+
items: Array.isArray(trades) ? trades : [trades],
|
|
7
|
+
});
|
|
8
|
+
|
|
5
9
|
const useTradeSelector = ({
|
|
6
10
|
minInput,
|
|
7
11
|
urls,
|
|
8
12
|
onTradeSelected,
|
|
13
|
+
initialTrade,
|
|
9
14
|
}: useTradeSelectorProps) => {
|
|
10
15
|
const [userInput, setUserInput] = useState<string>("");
|
|
11
16
|
const [selectedTrade, setSelectedTrade] = useState<TradeProps | undefined>(
|
|
12
|
-
|
|
17
|
+
initialTrade,
|
|
13
18
|
);
|
|
14
19
|
const [hasUserChangedMind, setHasUserChangedMind] = useState<Boolean>(false);
|
|
15
20
|
const endpoint = `${urls.tradeApi}?q=${encodeURIComponent(userInput)}&site=${
|
|
@@ -17,12 +22,17 @@ const useTradeSelector = ({
|
|
|
17
22
|
}`;
|
|
18
23
|
const list = useAsyncList({
|
|
19
24
|
async load({ signal }) {
|
|
25
|
+
if (userInput.length === 0) return formattedTrades();
|
|
26
|
+
|
|
27
|
+
if (initialTrade && userInput.length === 0) formattedTrades(initialTrade);
|
|
28
|
+
|
|
20
29
|
const response = await fetch(endpoint, {
|
|
21
30
|
signal,
|
|
22
31
|
});
|
|
23
32
|
|
|
24
33
|
const json = await response.json();
|
|
25
|
-
|
|
34
|
+
|
|
35
|
+
return formattedTrades(json.results);
|
|
26
36
|
},
|
|
27
37
|
});
|
|
28
38
|
|
|
@@ -42,7 +52,12 @@ const useTradeSelector = ({
|
|
|
42
52
|
}
|
|
43
53
|
};
|
|
44
54
|
|
|
45
|
-
const handleUserChangedMind = () =>
|
|
55
|
+
const handleUserChangedMind = () => {
|
|
56
|
+
if (initialTrade) {
|
|
57
|
+
setUserInput(initialTrade.value);
|
|
58
|
+
}
|
|
59
|
+
setHasUserChangedMind(true);
|
|
60
|
+
};
|
|
46
61
|
|
|
47
62
|
useEffect(() => {
|
|
48
63
|
if (userInput.length >= minInput) list.reload();
|