admin/ota-admin-portal
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CEC-5367: add vin: prefix and implement in fleets (#478)

Browse Source
This commit is contained in:
Tristan Timblin
2023-11-06 10:02:59 -08:00
committed by GitHub
parent 470495cfe9
commit 165cb7109f
5 changed files with 165 additions and 127 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/components/Cars/List/useQuery.js
View File

@@ -6,11 +6,16 @@ const TYPE_VIN = "vin";
/**
* Match VIN with RegEx
* @param {string} vin - potential VIN
* @returns {boolean}
* @returns {[boolean, string]}
*/
function isVIN(vin) {
function parseVin(vin = "") {
const prefix = new RegExp(`^${TYPE_VIN}:`);
if (vin.match(prefix)) {
return [true, vin.replace(prefix, "")];
}
var re = new RegExp("^[A-HJ-NPR-Z0-9]{8}[0-9X][A-HJ-NPR-Z0-9]{2}[0-9]{6}$");
return vin.match(re)
return [vin.match(re), vin];
}
/**
@@ -24,9 +29,10 @@ function isVIN(vin) {
function parseQueryPart(part) {
let type = "search";
if (isVIN(part)) {
const [isVin, vin] = parseVin(part)
if (isVin) {
type = TYPE_VIN;
part = `${part}`;
part = vin;
}
return [type, part];
@@ -55,11 +61,19 @@ export default function useQuery() {
}
});
setQuery(() => parts.map(([type, part]) => {
if (type !== "search") {
return `${type}:${part}`;
}
return part;
}).join(" ").replace(/\s{2,}/g, ' ').trim());
setPayload({
search,
vins: vins.join(","),
})
}, [query, setPayload]);
}, [query, setPayload, setQuery]);
useEffect(() => {
setLoading(false);

79
src/components/Cars/List/useQuery.test.jsx
View File

@@ -35,25 +35,80 @@ const template = (desc, data, expected) => {
fireEvent.change(input, { target: { value: data } });
expect(search.innerHTML).toBe(expected[0]);
expect(vins.innerHTML).toBe(expected[1]);
expect(query.innerHTML).toBe(data);
expect(query.innerHTML).toBe(expected[2]);
});
}
describe("useQuery", () => {
[
["parses a search query", "test", ["test", ""]],
["parses a vin query", "VCF1ZBU23PG001209", ["", "VCF1ZBU23PG001209"]],
["parses a mixed search and vin query", "test VCF1ZBU23PG001209", ["test", "VCF1ZBU23PG001209"]],
[
"parses a search query",
"test",
["test", "", "test"]
],
[
"parses a vin query",
"VCF1ZBU23PG001209",
["", "VCF1ZBU23PG001209", "vin:VCF1ZBU23PG001209"]
],
[
"parses a mixed search and vin query",
"test VCF1ZBU23PG001209",
["test", "VCF1ZBU23PG001209", "test vin:VCF1ZBU23PG001209"]
],
["parses a comma separated search query", "ocean,pear,alaska,ronin", ["ocean pear alaska ronin", ""]],
["parses a comma separated vin query", "VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162", ["", "VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162"]],
["parses a comma separated mixed search and vin query", "test,VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162", ["test", "VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162"]],
[
"parses a comma separated search query",
"ocean,pear,alaska,ronin",
["ocean pear alaska ronin", "", "ocean pear alaska ronin"]
],
[
"parses a comma separated vin query",
"VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162",
["", "VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162", "vin:VCF1EBE2008016235 vin:VCF1EBE20PG001002 vin:VCF1EBE20PG001162"]
],
[
"parses a comma separated mixed search and vin query",
"test,VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162",
["test", "VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162", "test vin:VCF1EBE2008016235 vin:VCF1EBE20PG001002 vin:VCF1EBE20PG001162"]
],
["parses a space separated search query", "ocean pear alaska ronin", ["ocean pear alaska ronin", ""]],
["parses a space separated vin query", "VCF1EBE2008016235 VCF1EBE20PG001002 VCF1EBE20PG001162", ["", "VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162"]],
["parses a space separated mixed search and vin query", "test VCF1EBE2008016235 VCF1EBE20PG001002 VCF1EBE20PG001162", ["test", "VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162"]],
[
"parses a space separated search query",
"ocean pear alaska ronin",
["ocean pear alaska ronin", "", "ocean pear alaska ronin"]
],
[
"parses a space separated vin query",
"VCF1EBE2008016235 VCF1EBE20PG001002 VCF1EBE20PG001162",
["", "VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162", "vin:VCF1EBE2008016235 vin:VCF1EBE20PG001002 vin:VCF1EBE20PG001162"]
],
[
"parses a space separated mixed search and vin query",
"test VCF1EBE2008016235 VCF1EBE20PG001002 VCF1EBE20PG001162",
["test", "VCF1EBE2008016235,VCF1EBE20PG001002,VCF1EBE20PG001162", "test vin:VCF1EBE2008016235 vin:VCF1EBE20PG001002 vin:VCF1EBE20PG001162"]
],
["trims extraneous values from search", "ocean,, , ,,,,pear,,, ", ["ocean pear", ""]],
["trims extraneous values from vins", "VCF1EBE2008016235,, , ,,,,VCF1EBE20PG001002,,, ", ["", "VCF1EBE2008016235,VCF1EBE20PG001002"]],
[
"trims extraneous values from search",
"ocean,, , ,,,,pear,,, ",
["ocean pear", "", "ocean pear"]
],
[
"trims extraneous values from vins",
"VCF1EBE2008016235,, , ,,,,VCF1EBE20PG001002,,, ",
["", "VCF1EBE2008016235,VCF1EBE20PG001002", "vin:VCF1EBE2008016235 vin:VCF1EBE20PG001002"]
],
[
"honors a declared vin",
"vin:1209",
["", "1209", "vin:1209"]
],
[
"keeps order of query parts",
"test vin:1209 VCF1EBE2008016235,VCF1EBE20PG001002 test2",
["test test2", "1209,VCF1EBE2008016235,VCF1EBE20PG001002", "test vin:1209 vin:VCF1EBE2008016235 vin:VCF1EBE20PG001002 test2"]
],
].forEach((args) => template(...args))
});