Merge pull request #160 from stephb9959/dev

2.5.44: allowing for the * symbol to be used on the device search bar
This commit is contained in:
Charles
2022-02-10 18:58:38 +00:00
committed by GitHub
3 changed files with 12 additions and 12 deletions

18
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{ {
"name": "ucentral-client", "name": "ucentral-client",
"version": "2.5.43", "version": "2.5.44",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "ucentral-client", "name": "ucentral-client",
"version": "2.5.43", "version": "2.5.44",
"dependencies": { "dependencies": {
"@coreui/coreui": "^3.4.0", "@coreui/coreui": "^3.4.0",
"@coreui/icons": "^2.0.1", "@coreui/icons": "^2.0.1",
@@ -33,7 +33,7 @@
"react-tooltip": "^4.2.21", "react-tooltip": "^4.2.21",
"react-widgets": "^5.1.1", "react-widgets": "^5.1.1",
"sass": "^1.35.1", "sass": "^1.35.1",
"ucentral-libs": "^1.0.59", "ucentral-libs": "^1.0.60",
"uuid": "^8.3.2" "uuid": "^8.3.2"
}, },
"devDependencies": { "devDependencies": {
@@ -13333,9 +13333,9 @@
} }
}, },
"node_modules/ucentral-libs": { "node_modules/ucentral-libs": {
"version": "1.0.59", "version": "1.0.60",
"resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.59.tgz", "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.60.tgz",
"integrity": "sha512-QtfJmHLmQRfRIMYttjAS4JpyPsbf9KVCZd1kn9VC7/j5K9EaZlzCLgZkAPTqW76EvQzvitmkXU4B0WWaHhflrg==", "integrity": "sha512-PRw2QTcbnHdrA8rPQhREI1FOKyuZUt48H3KcSGQgHpik2Ni+0una7jRfMFXwOU9yHzxQAlYG0EWLrzBnrKRvGA==",
"dependencies": { "dependencies": {
"@coreui/coreui": "^3.4.0", "@coreui/coreui": "^3.4.0",
"@coreui/icons": "^2.0.1", "@coreui/icons": "^2.0.1",
@@ -24860,9 +24860,9 @@
} }
}, },
"ucentral-libs": { "ucentral-libs": {
"version": "1.0.59", "version": "1.0.60",
"resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.59.tgz", "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-1.0.60.tgz",
"integrity": "sha512-QtfJmHLmQRfRIMYttjAS4JpyPsbf9KVCZd1kn9VC7/j5K9EaZlzCLgZkAPTqW76EvQzvitmkXU4B0WWaHhflrg==", "integrity": "sha512-PRw2QTcbnHdrA8rPQhREI1FOKyuZUt48H3KcSGQgHpik2Ni+0una7jRfMFXwOU9yHzxQAlYG0EWLrzBnrKRvGA==",
"requires": { "requires": {
"@coreui/coreui": "^3.4.0", "@coreui/coreui": "^3.4.0",
"@coreui/icons": "^2.0.1", "@coreui/icons": "^2.0.1",

View File

@@ -1,6 +1,6 @@
{ {
"name": "ucentral-client", "name": "ucentral-client",
"version": "2.5.43", "version": "2.5.44",
"dependencies": { "dependencies": {
"@coreui/coreui": "^3.4.0", "@coreui/coreui": "^3.4.0",
"@coreui/icons": "^2.0.1", "@coreui/icons": "^2.0.1",
@@ -27,7 +27,7 @@
"react-tooltip": "^4.2.21", "react-tooltip": "^4.2.21",
"react-widgets": "^5.1.1", "react-widgets": "^5.1.1",
"sass": "^1.35.1", "sass": "^1.35.1",
"ucentral-libs": "^1.0.59", "ucentral-libs": "^1.0.60",
"uuid": "^8.3.2" "uuid": "^8.3.2"
}, },
"main": "index.js", "main": "index.js",

View File

@@ -15,7 +15,7 @@ const DeviceSearchBar = ({ action }) => {
const search = (value) => { const search = (value) => {
if (socket.readyState === WebSocket.OPEN) { if (socket.readyState === WebSocket.OPEN) {
if (value.length > 0 && value.match('^[a-fA-F0-9]+$')) { if (value.length > 1 && value.match('^[a-fA-F0-9-*]+$')) {
setWaitingSearch(''); setWaitingSearch('');
socket.send( socket.send(
JSON.stringify({ command: 'serial_number_search', serial_prefix: value.toLowerCase() }), JSON.stringify({ command: 'serial_number_search', serial_prefix: value.toLowerCase() }),