From e60c000aad9f4da01ef26e58fa72f7bf3466cdb6 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 27 Oct 2021 15:49:35 -0400 Subject: [PATCH 1/7] UI fixes, my profile page rework --- package-lock.json | 18 ++--- package.json | 4 +- public/locales/de/translation.json | 1 + public/locales/en/translation.json | 1 + public/locales/es/translation.json | 1 + public/locales/fr/translation.json | 1 + public/locales/pt/translation.json | 1 + src/components/CommandHistory/index.js | 6 +- src/components/ConfigurationDisplay/index.js | 4 +- src/components/DeviceActionCard/index.js | 2 +- src/components/InterfaceStatistics/index.js | 8 +- src/components/WifiAnalysis/index.js | 7 +- src/pages/DeviceListPage/index.js | 8 +- src/pages/FirmwareListPage/index.js | 10 +-- src/pages/ProfilePage/index.js | 85 ++++++++------------ src/scss/_custom.scss | 13 +++ 16 files changed, 85 insertions(+), 85 deletions(-) diff --git a/package-lock.json b/package-lock.json index 2ea6857..b74c4c7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ucentral-client", - "version": "2.3.2", + "version": "2.3.3", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ucentral-client", - "version": "2.3.2", + "version": "2.3.3", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -32,7 +32,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.89", + "ucentral-libs": "^0.9.92", "uuid": "^8.3.2" }, "devDependencies": { @@ -14842,9 +14842,9 @@ } }, "node_modules/ucentral-libs": { - "version": "0.9.89", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.89.tgz", - "integrity": "sha512-KH1RSQzN7AJTsryibxr3kfoYgr1Y80lQP5cB8mOcbqYamv3PS9F2QJHTQNoNOwQGASFd6D+WdnAj/viqV1wM0A==", + "version": "0.9.92", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.92.tgz", + "integrity": "sha512-VlUKckVpmNx/gK6dGachKKwhuKh3Pknfv+uwJGG6RR1EXu0vbLPu0UokPEORpeTkA2S5gsnpvE+/WEkBMPaJsQ==", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -27716,9 +27716,9 @@ } }, "ucentral-libs": { - "version": "0.9.89", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.89.tgz", - "integrity": "sha512-KH1RSQzN7AJTsryibxr3kfoYgr1Y80lQP5cB8mOcbqYamv3PS9F2QJHTQNoNOwQGASFd6D+WdnAj/viqV1wM0A==", + "version": "0.9.92", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.92.tgz", + "integrity": "sha512-VlUKckVpmNx/gK6dGachKKwhuKh3Pknfv+uwJGG6RR1EXu0vbLPu0UokPEORpeTkA2S5gsnpvE+/WEkBMPaJsQ==", "requires": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", diff --git a/package.json b/package.json index 0579fe2..c0aea51 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucentral-client", - "version": "2.3.2", + "version": "2.3.3", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -26,7 +26,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.89", + "ucentral-libs": "^0.9.92", "uuid": "^8.3.2" }, "main": "index.js", diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json index a1304ad..742b9f4 100644 --- a/public/locales/de/translation.json +++ b/public/locales/de/translation.json @@ -89,6 +89,7 @@ "endpoints": "Endpunkte", "error": "Fehler", "error_adding_note": "Fehler beim Hinzufügen einer Notiz", + "error_code": "Fehlercode", "execute_now": "Möchten Sie diesen Befehl jetzt ausführen?", "executed": "Ausgeführt", "exit": "Ausgang", diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index 7f43ada..b2d260d 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -89,6 +89,7 @@ "endpoints": "Endpoints", "error": "Error", "error_adding_note": "Error while adding note", + "error_code": "Error Code", "execute_now": "Would you like to execute this command now?", "executed": "Executed", "exit": "Exit", diff --git a/public/locales/es/translation.json b/public/locales/es/translation.json index 1463cf5..5a2654f 100644 --- a/public/locales/es/translation.json +++ b/public/locales/es/translation.json @@ -89,6 +89,7 @@ "endpoints": "Puntos finales", "error": "Error", "error_adding_note": "Error al agregar una nota", + "error_code": "código de error", "execute_now": "¿Le gustaría ejecutar este comando ahora?", "executed": "ejecutado", "exit": "salida", diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json index 54be28b..42a52f5 100644 --- a/public/locales/fr/translation.json +++ b/public/locales/fr/translation.json @@ -89,6 +89,7 @@ "endpoints": "Points de terminaison", "error": "Erreur", "error_adding_note": "Erreur lors de l'ajout de la note", + "error_code": "Code d'erreur", "execute_now": "Souhaitez-vous exécuter cette commande maintenant ?", "executed": "réalisé", "exit": "Sortie", diff --git a/public/locales/pt/translation.json b/public/locales/pt/translation.json index 4dbca61..13c6ec4 100644 --- a/public/locales/pt/translation.json +++ b/public/locales/pt/translation.json @@ -89,6 +89,7 @@ "endpoints": "Pontos finais", "error": "Erro", "error_adding_note": "Erro ao adicionar nota", + "error_code": "Erro de código", "execute_now": "Você gostaria de executar este comando agora?", "executed": "Executado", "exit": "Saída", diff --git a/src/components/CommandHistory/index.js b/src/components/CommandHistory/index.js index 1023ce9..ec5f01e 100644 --- a/src/components/CommandHistory/index.js +++ b/src/components/CommandHistory/index.js @@ -190,9 +190,9 @@ const DeviceCommands = () => { const columns = [ { key: 'submitted', label: t('common.submitted'), filter: false, _style: { width: '20%' } }, { key: 'command', label: t('common.command'), _style: { width: '15%' } }, - { key: 'executed', label: t('common.executed'), filter: false, _style: { width: '20%' } }, - { key: 'completed', label: t('common.completed'), filter: false, _style: { width: '20%' } }, - { key: 'errorCode', label: t('common.code'), filter: false, _style: { width: '5%' } }, + { key: 'executed', label: t('common.executed'), filter: false, _style: { width: '16%' } }, + { key: 'completed', label: t('common.completed'), filter: false, _style: { width: '16%' } }, + { key: 'errorCode', label: t('common.error_code'), filter: false, _style: { width: '8%' } }, { key: 'show_buttons', label: '', diff --git a/src/components/ConfigurationDisplay/index.js b/src/components/ConfigurationDisplay/index.js index 111fac0..7014ca4 100644 --- a/src/components/ConfigurationDisplay/index.js +++ b/src/components/ConfigurationDisplay/index.js @@ -20,11 +20,11 @@ const ConfigurationDisplay = ({ getData, deviceConfig }) => { const { t } = useTranslation(); return ( - +
- + diff --git a/src/components/DeviceActionCard/index.js b/src/components/DeviceActionCard/index.js index c777c93..fb8bf0d 100644 --- a/src/components/DeviceActionCard/index.js +++ b/src/components/DeviceActionCard/index.js @@ -122,7 +122,7 @@ const DeviceActions = () => { return ( - +
{t('actions.title')}
 diff --git a/src/components/InterfaceStatistics/index.js b/src/components/InterfaceStatistics/index.js index d942f5b..6a0b709 100644 --- a/src/components/InterfaceStatistics/index.js +++ b/src/components/InterfaceStatistics/index.js @@ -28,22 +28,22 @@ const DeviceStatisticsCard = () => { return (
- +
- +
- + Lifetime Statistics
- + {t('statistics.show_latest')}
diff --git a/src/components/WifiAnalysis/index.js b/src/components/WifiAnalysis/index.js index 579606e..7e20789 100644 --- a/src/components/WifiAnalysis/index.js +++ b/src/components/WifiAnalysis/index.js @@ -201,13 +201,10 @@ const WifiAnalysis = () => { return (
- + - -
{t('common.device', { serialNumber: deviceId })}
- - + {t('wifi_analysis.network_diagram')} diff --git a/src/pages/DeviceListPage/index.js b/src/pages/DeviceListPage/index.js index d8464b2..c9bc715 100644 --- a/src/pages/DeviceListPage/index.js +++ b/src/pages/DeviceListPage/index.js @@ -18,7 +18,7 @@ const DeviceListPage = () => { active={index === 0} onClick={() => setIndex(0)} > - {t('common.table')} + {t('common.dashboard')} { active={index === 1} onClick={() => setIndex(1)} > - {t('common.dashboard')} + {t('common.devices')} - + - + diff --git a/src/pages/FirmwareListPage/index.js b/src/pages/FirmwareListPage/index.js index 2d59c9b..3aa4a20 100644 --- a/src/pages/FirmwareListPage/index.js +++ b/src/pages/FirmwareListPage/index.js @@ -227,7 +227,7 @@ const FirmwareListPage = () => { active={index === 0} onClick={() => setIndex(0)} > - {t('common.table')} + {t('common.dashboard')} { active={index === 1} onClick={() => setIndex(1)} > - {t('common.dashboard')} + {t('common.firmware')} + + + { toggleDevDisplay={toggleDevDisplay} /> - - - diff --git a/src/pages/ProfilePage/index.js b/src/pages/ProfilePage/index.js index 7453c9c..6c89a97 100644 --- a/src/pages/ProfilePage/index.js +++ b/src/pages/ProfilePage/index.js @@ -63,6 +63,7 @@ const ProfilePage = () => { const [userForm, updateWithId, updateWithKey, setUser] = useUser(initialState); const [newAvatar, setNewAvatar] = useState(''); const [newAvatarFile, setNewAvatarFile] = useState(null); + const [avatarDeleted, setAvatarDeleted] = useState(false); const [fileInputKey, setFileInputKey] = useState(0); const [policies, setPolicies] = useState({ passwordPolicy: '', @@ -161,8 +162,22 @@ const ProfilePage = () => { const updateUser = () => { setLoading(true); - if (newAvatarFile !== null) { + if (newAvatar !== '' && newAvatarFile !== null) { uploadAvatar(); + } else if (avatarDeleted) { + const options = { + headers: { + Accept: 'application/json', + Authorization: `Bearer ${currentToken}`, + }, + }; + + axiosInstance + .delete(`${endpoints.owsec}/api/v1/avatar/${user.Id}`, options) + .then(() => { + getAvatar(); + }) + .catch(() => {}); } if ( @@ -240,29 +255,15 @@ const ProfilePage = () => { }; const showPreview = (e) => { + setAvatarDeleted(false); const imageFile = e.target.files[0]; setNewAvatar(URL.createObjectURL(imageFile)); setNewAvatarFile(imageFile); }; const deleteAvatar = () => { - setLoading(true); - const options = { - headers: { - Accept: 'application/json', - Authorization: `Bearer ${currentToken}`, - }, - }; - - return axiosInstance - .delete(`${endpoints.owsec}/api/v1/avatar/${user.Id}`, options) - .then(() => { - getAvatar(); - }) - .catch(() => {}) - .finally(() => { - setLoading(false); - }); + setNewAvatar(''); + setAvatarDeleted(true); }; const sendPhoneNumberTest = async (phoneNumber) => { @@ -314,7 +315,12 @@ const ProfilePage = () => { }; const toggleEditing = () => { - if (editing) getUser(); + if (editing) { + setAvatarDeleted(false); + setNewAvatar(''); + getUser(); + getAvatar(); + } setEditing(!editing); }; @@ -329,52 +335,30 @@ const ProfilePage = () => { }, [user.Id]); return ( - - -
{t('user.my_profile')}
+ + +
+ {t('user.my_profile')} +
- + - + - + - + @@ -398,6 +382,7 @@ const ProfilePage = () => { sendPhoneNumberTest={sendPhoneNumberTest} testVerificationCode={testVerificationCode} editing={editing} + avatarDeleted={avatarDeleted} /> diff --git a/src/scss/_custom.scss b/src/scss/_custom.scss index 7621b8c..7f8e221 100644 --- a/src/scss/_custom.scss +++ b/src/scss/_custom.scss @@ -30,3 +30,16 @@ pre.ignore { .tooltipRight { &::after { left: 75% !important; } } .tooltipRight { &::before { left: 75% !important; } } + +.dark-header { + padding: .25rem !important; + margin-top: 0 !important; + margin-bottom: 0 !important; + color: #ebedef !important; + background-color: #2f3d54 !important; +} + +.avatar-lg { + height: 10rem; + width: 10rem; +} From b26408ade2f2f3173973fc1cf0f7e442749ac994 Mon Sep 17 00:00:00 2001 From: Charles Date: Wed, 27 Oct 2021 16:09:15 -0400 Subject: [PATCH 2/7] Tables now more compact --- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- src/components/CommandHistory/index.js | 11 ++++++----- src/components/DeviceHealth/index.js | 1 + src/components/DeviceLogs/index.js | 3 ++- .../WifiScanResultModal/WifiChannelCard.js | 1 + 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/package-lock.json b/package-lock.json index b74c4c7..22bdbb8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ucentral-client", - "version": "2.3.3", + "version": "2.3.4", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ucentral-client", - "version": "2.3.3", + "version": "2.3.4", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -32,7 +32,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.92", + "ucentral-libs": "^0.9.93", "uuid": "^8.3.2" }, "devDependencies": { @@ -14842,9 +14842,9 @@ } }, "node_modules/ucentral-libs": { - "version": "0.9.92", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.92.tgz", - "integrity": "sha512-VlUKckVpmNx/gK6dGachKKwhuKh3Pknfv+uwJGG6RR1EXu0vbLPu0UokPEORpeTkA2S5gsnpvE+/WEkBMPaJsQ==", + "version": "0.9.93", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.93.tgz", + "integrity": "sha512-8DcG4TxSJEXBKHKpORTFcBFUpOvAGZLq1JJsYWbe10DXWMM0JRbahqkAmXHb1sNJock6hAhZeUtpXXI2MvBb/A==", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -27716,9 +27716,9 @@ } }, "ucentral-libs": { - "version": "0.9.92", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.92.tgz", - "integrity": "sha512-VlUKckVpmNx/gK6dGachKKwhuKh3Pknfv+uwJGG6RR1EXu0vbLPu0UokPEORpeTkA2S5gsnpvE+/WEkBMPaJsQ==", + "version": "0.9.93", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.93.tgz", + "integrity": "sha512-8DcG4TxSJEXBKHKpORTFcBFUpOvAGZLq1JJsYWbe10DXWMM0JRbahqkAmXHb1sNJock6hAhZeUtpXXI2MvBb/A==", "requires": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", diff --git a/package.json b/package.json index c0aea51..119a87f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucentral-client", - "version": "2.3.3", + "version": "2.3.4", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -26,7 +26,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.92", + "ucentral-libs": "^0.9.93", "uuid": "^8.3.2" }, "main": "index.js", diff --git a/src/components/CommandHistory/index.js b/src/components/CommandHistory/index.js index ec5f01e..166121a 100644 --- a/src/components/CommandHistory/index.js +++ b/src/components/CommandHistory/index.js @@ -265,6 +265,7 @@ const DeviceCommands = () => {
{ { ) : ( )} @@ -342,7 +343,7 @@ const DeviceCommands = () => { toggleResponse(item); }} > - + @@ -356,7 +357,7 @@ const DeviceCommands = () => { toggleConfirmModal(item.UUID, index); }} > - + diff --git a/src/components/DeviceHealth/index.js b/src/components/DeviceHealth/index.js index 70ce54a..55f9d3f 100644 --- a/src/components/DeviceHealth/index.js +++ b/src/components/DeviceHealth/index.js @@ -181,6 +181,7 @@ const DeviceHealth = () => {
{
{ toggleDetails(index); }} > - + ), diff --git a/src/components/WifiScanResultModal/WifiChannelCard.js b/src/components/WifiScanResultModal/WifiChannelCard.js index 8839bc3..c23256b 100644 --- a/src/components/WifiScanResultModal/WifiChannelCard.js +++ b/src/components/WifiScanResultModal/WifiChannelCard.js @@ -24,6 +24,7 @@ const WifiChannelCard = ({ channel }) => {
Date: Thu, 28 Oct 2021 10:00:19 -0400 Subject: [PATCH 3/7] User and Firmware tables now using modals --- package-lock.json | 18 +- package.json | 4 +- src/components/CommandHistory/index.js | 31 +-- src/components/DeviceHealth/index.js | 10 +- src/components/DeviceLogs/index.js | 15 +- src/components/EditFirmwareModal/index.js | 230 ++++++++++++++++++++++ src/components/EditUserModal/index.js | 16 ++ src/pages/FirmwareListPage/index.js | 85 ++------ 8 files changed, 309 insertions(+), 100 deletions(-) create mode 100644 src/components/EditFirmwareModal/index.js diff --git a/package-lock.json b/package-lock.json index 22bdbb8..975de2d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ucentral-client", - "version": "2.3.4", + "version": "2.3.5", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ucentral-client", - "version": "2.3.4", + "version": "2.3.5", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -32,7 +32,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.93", + "ucentral-libs": "^0.9.94", "uuid": "^8.3.2" }, "devDependencies": { @@ -14842,9 +14842,9 @@ } }, "node_modules/ucentral-libs": { - "version": "0.9.93", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.93.tgz", - "integrity": "sha512-8DcG4TxSJEXBKHKpORTFcBFUpOvAGZLq1JJsYWbe10DXWMM0JRbahqkAmXHb1sNJock6hAhZeUtpXXI2MvBb/A==", + "version": "0.9.94", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.94.tgz", + "integrity": "sha512-sCvCdgxaj7aKcSC/T3+pPTAp3f09HSQQLeRsOAa/o3ZneoBIGVdhiOcKUR4sl/yP6Ew1ZH5J76PNQcm5Gu3fWA==", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -27716,9 +27716,9 @@ } }, "ucentral-libs": { - "version": "0.9.93", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.93.tgz", - "integrity": "sha512-8DcG4TxSJEXBKHKpORTFcBFUpOvAGZLq1JJsYWbe10DXWMM0JRbahqkAmXHb1sNJock6hAhZeUtpXXI2MvBb/A==", + "version": "0.9.94", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.94.tgz", + "integrity": "sha512-sCvCdgxaj7aKcSC/T3+pPTAp3f09HSQQLeRsOAa/o3ZneoBIGVdhiOcKUR4sl/yP6Ew1ZH5J76PNQcm5Gu3fWA==", "requires": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", diff --git a/package.json b/package.json index 119a87f..bd03c29 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucentral-client", - "version": "2.3.4", + "version": "2.3.5", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -26,7 +26,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.93", + "ucentral-libs": "^0.9.94", "uuid": "^8.3.2" }, "main": "index.js", diff --git a/src/components/CommandHistory/index.js b/src/components/CommandHistory/index.js index 166121a..0ca05a9 100644 --- a/src/components/CommandHistory/index.js +++ b/src/components/CommandHistory/index.js @@ -14,11 +14,11 @@ import { import CIcon from '@coreui/icons-react'; import DatePicker from 'react-widgets/DatePicker'; import { cilCloudDownload, cilSync, cilCalendarCheck } from '@coreui/icons'; -import { prettyDate, dateToUnix } from 'utils/helper'; +import { dateToUnix } from 'utils/helper'; import axiosInstance from 'utils/axiosInstance'; import eventBus from 'utils/eventBus'; import ConfirmModal from 'components/ConfirmModal'; -import { LoadingButton, useAuth, useDevice } from 'ucentral-libs'; +import { LoadingButton, useAuth, useDevice, FormattedDate } from 'ucentral-libs'; import WifiScanResultModalWidget from 'components/WifiScanResultModal'; import DetailsModal from './DetailsModal'; @@ -273,25 +273,32 @@ const DeviceCommands = () => { className="text-white" sorterValue={{ column: 'created', desc: 'true' }} scopedSlots={{ + command: (item) => {item.command}, completed: (item) => ( - {item.completed && item.completed !== 0 - ? prettyDate(item.completed) - : 'Pending'} + {item.completed && item.completed !== 0 ? ( + + ) : ( + 'Pending' + )} ), executed: (item) => ( - {item.executed && item.executed !== 0 - ? prettyDate(item.executed) - : 'Pending'} + {item.executed && item.executed !== 0 ? ( + + ) : ( + 'Pending' + )} ), submitted: (item) => ( - {item.submitted && item.submitted !== '' - ? prettyDate(item.submitted) - : 'Pending'} + {item.submitted && item.submitted !== '' ? ( + + ) : ( + 'Pending' + )} ), errorCode: (item) => {item.errorCode}, @@ -300,7 +307,7 @@ const DeviceCommands = () => { { @@ -190,7 +190,11 @@ const DeviceHealth = () => { sorterValue={{ column: 'recorded', desc: 'true' }} scopedSlots={{ UUID: (item) => {item.UUID}, - recorded: (item) => {prettyDate(item.recorded)}, + recorded: (item) => ( + + + + ), sanity: (item) => {`${item.sanity}%`}, checkDetails: (item) => ( diff --git a/src/components/DeviceLogs/index.js b/src/components/DeviceLogs/index.js index 9dcf107..3d0d266 100644 --- a/src/components/DeviceLogs/index.js +++ b/src/components/DeviceLogs/index.js @@ -15,10 +15,10 @@ import CIcon from '@coreui/icons-react'; import { cilTrash } from '@coreui/icons'; import { useTranslation } from 'react-i18next'; import DatePicker from 'react-widgets/DatePicker'; -import { prettyDate, dateToUnix } from 'utils/helper'; +import { dateToUnix } from 'utils/helper'; import axiosInstance from 'utils/axiosInstance'; import eventBus from 'utils/eventBus'; -import { LoadingButton, useAuth, useDevice } from 'ucentral-libs'; +import { LoadingButton, useAuth, useDevice, FormattedDate } from 'ucentral-libs'; import DeleteLogModal from 'components/DeleteLogModal'; const DeviceLogs = () => { @@ -195,9 +195,16 @@ const DeviceLogs = () => { className="text-white" sorterValue={{ column: 'recorded', desc: 'true' }} scopedSlots={{ - recorded: (item) => {prettyDate(item.recorded)}, + recorded: (item) => ( + + + + ), + UUID: (item) => {item.UUID}, + severity: (item) => {item.severity}, + log: (item) => {item.log}, show_details: (item, index) => ( - + { + const { t } = useTranslation(); + const { currentToken, endpoints } = useAuth(); + const { addToast } = useToast(); + const [loading, setLoading] = useState(false); + const [editing, setEditing] = useState(false); + const [firmware, updateWithId, updateWithKey, setFirmware] = useFormFields(initialState); + + const getFirmware = () => { + const options = { + headers: { + Accept: 'application/json', + Authorization: `Bearer ${currentToken}`, + }, + }; + + axiosInstance + .get(`${endpoints.owfms}/api/v1/firmware/${firmwareId}`, options) + .then((response) => { + const newFirmware = {}; + + for (const key of Object.keys(response.data)) { + if (key in initialState && key !== 'currentPassword') { + newFirmware[key] = { + ...initialState[key], + value: response.data[key], + }; + } + } + setFirmware({ ...initialState, ...newFirmware }); + }) + .catch(() => {}); + }; + + const toggleEditing = () => { + if (editing) { + getFirmware(); + } + setEditing(!editing); + }; + + const updateFirmware = () => { + setLoading(true); + + const parameters = { + id: firmwareId, + description: firmware.description.value, + }; + + const newNotes = []; + for (let i = 0; i < firmware.notes.value.length; i += 1) { + if (firmware.notes.value[i].new) newNotes.push({ note: firmware.notes.value[i].note }); + } + + parameters.notes = newNotes; + + const options = { + headers: { + Accept: 'application/json', + Authorization: `Bearer ${currentToken}`, + }, + }; + + axiosInstance + .put(`${endpoints.owfms}/api/v1/firmware/${firmwareId}`, parameters, options) + .then(() => { + addToast({ + title: t('firmware.update_success_title'), + body: t('firmware.update_success'), + color: 'success', + autohide: true, + }); + refreshTable(); + toggle(); + }) + .catch((e) => { + addToast({ + title: t('firmware.update_failure_title'), + body: t('firmware.update_failure', { error: e.response?.data?.ErrorDescription }), + color: 'danger', + autohide: true, + }); + getFirmware(); + }) + .finally(() => { + setLoading(false); + }); + }; + + const addNote = (currentNote) => { + const newNotes = [...firmware.notes.value]; + newNotes.unshift({ + note: currentNote, + new: true, + created: new Date().getTime() / 1000, + createdBy: '', + }); + updateWithKey('notes', { value: newNotes }); + }; + + useEffect(() => { + if (show) { + getFirmware(); + setEditing(false); + } + }, [show]); + + return ( + + + + {t('firmware.details_title', { image: firmware.image.value })} + +
+ + + + + + + + + + + + + + + + + + + + +
+ + + + + + ); +}; + +EditFirmwareModal.propTypes = { + firmwareId: PropTypes.string.isRequired, + show: PropTypes.bool.isRequired, + toggle: PropTypes.func.isRequired, + refreshTable: PropTypes.func.isRequired, +}; + +export default React.memo(EditFirmwareModal); diff --git a/src/components/EditUserModal/index.js b/src/components/EditUserModal/index.js index 848ad8a..531816e 100644 --- a/src/components/EditUserModal/index.js +++ b/src/components/EditUserModal/index.js @@ -52,6 +52,7 @@ const EditUserModal = ({ show, toggle, userId, getUsers }) => { const { addToast } = useToast(); const [loading, setLoading] = useState(false); const [initialUser, setInitialUser] = useState({}); + const [editing, setEditing] = useState(false); const [user, updateWithId, updateWithKey, setUser] = useUser(initialState); const [policies, setPolicies] = useState({ passwordPolicy: '', @@ -98,6 +99,13 @@ const EditUserModal = ({ show, toggle, userId, getUsers }) => { .catch(() => {}); }; + const toggleEditing = () => { + if (editing) { + getUser(); + } + setEditing(!editing); + }; + const updateUser = () => { setLoading(true); @@ -197,6 +205,12 @@ const EditUserModal = ({ show, toggle, userId, getUsers }) => { } }, [userId]); + useEffect(() => { + if (show) { + setEditing(false); + } + }, [show]); + return ( { policies={policies} show={show} toggle={toggle} + editing={editing} + toggleEditing={toggleEditing} addNote={addNote} /> ); diff --git a/src/pages/FirmwareListPage/index.js b/src/pages/FirmwareListPage/index.js index 3aa4a20..7826792 100644 --- a/src/pages/FirmwareListPage/index.js +++ b/src/pages/FirmwareListPage/index.js @@ -5,6 +5,7 @@ import axiosInstance from 'utils/axiosInstance'; import { CCard, CCardBody, CNav, CNavLink, CTabPane, CTabContent } from '@coreui/react'; import { FirmwareList, useAuth, useToast } from 'ucentral-libs'; import FirmwareDashboard from 'components/FirmwareDashboard'; +import EditFirmwareModal from 'components/EditFirmwareModal'; const FirmwareListPage = () => { const { t } = useTranslation(); @@ -20,9 +21,14 @@ const FirmwareListPage = () => { const [filteredFirmware, setFilteredFirmware] = useState([]); const [displayedFirmware, setDisplayedFirmware] = useState([]); const [displayDev, setDisplayDev] = useState(false); - const [addNoteLoading, setAddNoteLoading] = useState(false); - const [updateDescriptionLoading, setUpdateDescriptionLoading] = useState(false); const [loading, setLoading] = useState(false); + const [showEditModal, setShowEditModal] = useState(false); + const [firmwareToEdit, setFirmwareToEdit] = useState(''); + + const toggleEditModal = (id) => { + if (id) setFirmwareToEdit(id); + setShowEditModal(!showEditModal); + }; const displayFirmware = (currentPage, perPage, firmwareToDisplay) => { setLoading(true); @@ -149,70 +155,6 @@ const FirmwareListPage = () => { getFirmware(value); }; - const addNote = (value, id) => { - setAddNoteLoading(true); - - const parameters = { - id, - notes: [{ note: value }], - }; - - const options = { - headers: { - Accept: 'application/json', - Authorization: `Bearer ${currentToken}`, - }, - }; - - axiosInstance - .put(`${endpoints.owfms}/api/v1/firmware/${id}`, parameters, options) - .then(() => { - getFirmware(); - setAddNoteLoading(false); - }) - .catch(() => { - setAddNoteLoading(false); - addToast({ - title: t('common.error'), - body: t('common.general_error'), - color: 'danger', - autohide: true, - }); - }); - }; - - const updateDescription = (value, id) => { - setUpdateDescriptionLoading(true); - - const parameters = { - id, - description: value, - }; - - const options = { - headers: { - Accept: 'application/json', - Authorization: `Bearer ${currentToken}`, - }, - }; - - axiosInstance - .put(`${endpoints.owfms}/api/v1/firmware/${id}`, parameters, options) - .then(() => { - getFirmware(); - setUpdateDescriptionLoading(false); - }) - .catch(() => { - setUpdateDescriptionLoading(false); - addToast({ - title: t('common.error'), - body: t('common.general_error'), - color: 'danger', - autohide: true, - }); - }); - }; - useEffect(() => { if (selectedDeviceType === '' && !loading) getDeviceTypes(); }, []); @@ -251,17 +193,20 @@ const FirmwareListPage = () => { setPage={updatePage} data={displayedFirmware} firmwarePerPage={firmwarePerPage} + toggleEditModal={toggleEditModal} setFirmwarePerPage={updateFirmwarePerPage} selectedDeviceType={selectedDeviceType} deviceTypes={deviceTypes} setSelectedDeviceType={updateSelectedType} - addNote={addNote} - addNoteLoading={addNoteLoading} - updateDescription={updateDescription} - updateDescriptionLoading={updateDescriptionLoading} displayDev={displayDev} toggleDevDisplay={toggleDevDisplay} /> + From 1961aa62da6779915167ac30ebd32603edd1c932 Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 28 Oct 2021 12:08:15 -0400 Subject: [PATCH 4/7] UI fixes, using new notes in my profile --- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- public/locales/de/translation.json | 2 ++ public/locales/en/translation.json | 2 ++ public/locales/es/translation.json | 2 ++ public/locales/fr/translation.json | 2 ++ public/locales/pt/translation.json | 2 ++ src/components/EditFirmwareModal/index.js | 18 ++++++------------ 8 files changed, 27 insertions(+), 23 deletions(-) diff --git a/package-lock.json b/package-lock.json index 975de2d..a277724 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ucentral-client", - "version": "2.3.5", + "version": "2.3.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ucentral-client", - "version": "2.3.5", + "version": "2.3.6", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -32,7 +32,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.94", + "ucentral-libs": "^0.9.95", "uuid": "^8.3.2" }, "devDependencies": { @@ -14842,9 +14842,9 @@ } }, "node_modules/ucentral-libs": { - "version": "0.9.94", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.94.tgz", - "integrity": "sha512-sCvCdgxaj7aKcSC/T3+pPTAp3f09HSQQLeRsOAa/o3ZneoBIGVdhiOcKUR4sl/yP6Ew1ZH5J76PNQcm5Gu3fWA==", + "version": "0.9.95", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.95.tgz", + "integrity": "sha512-Oivs0swIBvFq6Q0e7xcIgqQZPHQ2wXeBsjzX0NA7aI+BYcX0fSh8bP5wsljaCahZZsH8I9BLfyeoIGWicuDdfw==", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -27716,9 +27716,9 @@ } }, "ucentral-libs": { - "version": "0.9.94", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.94.tgz", - "integrity": "sha512-sCvCdgxaj7aKcSC/T3+pPTAp3f09HSQQLeRsOAa/o3ZneoBIGVdhiOcKUR4sl/yP6Ew1ZH5J76PNQcm5Gu3fWA==", + "version": "0.9.95", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.95.tgz", + "integrity": "sha512-Oivs0swIBvFq6Q0e7xcIgqQZPHQ2wXeBsjzX0NA7aI+BYcX0fSh8bP5wsljaCahZZsH8I9BLfyeoIGWicuDdfw==", "requires": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", diff --git a/package.json b/package.json index bd03c29..ec0134a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucentral-client", - "version": "2.3.5", + "version": "2.3.6", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -26,7 +26,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.94", + "ucentral-libs": "^0.9.95", "uuid": "^8.3.2" }, "main": "index.js", diff --git a/public/locales/de/translation.json b/public/locales/de/translation.json index 742b9f4..c8bac21 100644 --- a/public/locales/de/translation.json +++ b/public/locales/de/translation.json @@ -34,6 +34,8 @@ "access_policy": "Zugangsrichtlinien", "add": "Hinzufügen", "add_items": "Füge Artikel hinzu", + "add_note": "Notiz hinzufügen", + "add_note_explanation": "Schreiben Sie unten Ihre neue Notiz und klicken Sie auf die Schaltfläche \"+\", wo Sie fertig sind", "adding_ellipsis": "Hinzufügen ...", "are_you_sure": "Bist du sicher?", "back_to_login": "Zurück zur Anmeldung", diff --git a/public/locales/en/translation.json b/public/locales/en/translation.json index b2d260d..699c570 100644 --- a/public/locales/en/translation.json +++ b/public/locales/en/translation.json @@ -34,6 +34,8 @@ "access_policy": "Access Policy", "add": "Add", "add_items": "Add Items", + "add_note": "Add Note", + "add_note_explanation": "Write your new note below and click the '+' button where you are done", "adding_ellipsis": "Adding...", "are_you_sure": "Are you sure?", "back_to_login": "Back to Login", diff --git a/public/locales/es/translation.json b/public/locales/es/translation.json index 5a2654f..f59b09c 100644 --- a/public/locales/es/translation.json +++ b/public/locales/es/translation.json @@ -34,6 +34,8 @@ "access_policy": "Política de acceso", "add": "Añadir", "add_items": "Agregar articulos", + "add_note": "Añadir la nota", + "add_note_explanation": "Escriba su nueva nota a continuación y haga clic en el botón '+' donde haya terminado", "adding_ellipsis": "Añadiendo ...", "are_you_sure": "¿Estás seguro?", "back_to_login": "Atrás para iniciar sesión", diff --git a/public/locales/fr/translation.json b/public/locales/fr/translation.json index 42a52f5..8772775 100644 --- a/public/locales/fr/translation.json +++ b/public/locales/fr/translation.json @@ -34,6 +34,8 @@ "access_policy": "Politique d'accès", "add": "Ajouter", "add_items": "Ajouter des articles", + "add_note": "Ajouter une note", + "add_note_explanation": "Écrivez votre nouvelle note ci-dessous et cliquez sur le bouton '+' où vous avez terminé", "adding_ellipsis": "Ajouter...", "are_you_sure": "Êtes-vous sûr?", "back_to_login": "Retour connexion", diff --git a/public/locales/pt/translation.json b/public/locales/pt/translation.json index 13c6ec4..15e00bb 100644 --- a/public/locales/pt/translation.json +++ b/public/locales/pt/translation.json @@ -34,6 +34,8 @@ "access_policy": "Política de Acesso", "add": "Adicionar", "add_items": "Adicionar itens", + "add_note": "Adicionar nota", + "add_note_explanation": "Escreva sua nova nota abaixo e clique no botão '+' quando terminar", "adding_ellipsis": "Adicionando ...", "are_you_sure": "Você tem certeza?", "back_to_login": "Volte ao login", diff --git a/src/components/EditFirmwareModal/index.js b/src/components/EditFirmwareModal/index.js index 80b95fc..7133088 100644 --- a/src/components/EditFirmwareModal/index.js +++ b/src/components/EditFirmwareModal/index.js @@ -100,6 +100,11 @@ const EditFirmwareModal = ({ show, toggle, firmwareId, refreshTable }) => { setEditing(!editing); }; + const toggleModal = () => { + toggleEditing(); + toggle(); + }; + const updateFirmware = () => { setLoading(true); @@ -189,19 +194,8 @@ const EditFirmwareModal = ({ show, toggle, firmwareId, refreshTable }) => { - - - - - - + From 5da3fb6c19761de555482d50c087200adaf4a408 Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 28 Oct 2021 13:37:06 -0400 Subject: [PATCH 5/7] Upping ucentral-libs version --- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index a277724..5c2be8b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ucentral-client", - "version": "2.3.6", + "version": "2.3.7", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ucentral-client", - "version": "2.3.6", + "version": "2.3.7", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -32,7 +32,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.95", + "ucentral-libs": "^0.9.96", "uuid": "^8.3.2" }, "devDependencies": { @@ -14842,9 +14842,9 @@ } }, "node_modules/ucentral-libs": { - "version": "0.9.95", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.95.tgz", - "integrity": "sha512-Oivs0swIBvFq6Q0e7xcIgqQZPHQ2wXeBsjzX0NA7aI+BYcX0fSh8bP5wsljaCahZZsH8I9BLfyeoIGWicuDdfw==", + "version": "0.9.96", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.96.tgz", + "integrity": "sha512-Ad2wd6XtQbERcwMtARUwbKiJLt1bTLbpkcvd47XmQC9cjTk/DwqTK4E2r5JLPMTsrFIkoSj5Se/xyz0Lpi9tyA==", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -27716,9 +27716,9 @@ } }, "ucentral-libs": { - "version": "0.9.95", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.95.tgz", - "integrity": "sha512-Oivs0swIBvFq6Q0e7xcIgqQZPHQ2wXeBsjzX0NA7aI+BYcX0fSh8bP5wsljaCahZZsH8I9BLfyeoIGWicuDdfw==", + "version": "0.9.96", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.96.tgz", + "integrity": "sha512-Ad2wd6XtQbERcwMtARUwbKiJLt1bTLbpkcvd47XmQC9cjTk/DwqTK4E2r5JLPMTsrFIkoSj5Se/xyz0Lpi9tyA==", "requires": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", diff --git a/package.json b/package.json index ec0134a..00607f1 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucentral-client", - "version": "2.3.6", + "version": "2.3.7", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -26,7 +26,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.95", + "ucentral-libs": "^0.9.96", "uuid": "^8.3.2" }, "main": "index.js", From c35178bcbbc127c3082d04517b139f9773c25c50 Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 28 Oct 2021 14:04:31 -0400 Subject: [PATCH 6/7] Version 2.3.8 --- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5c2be8b..9584282 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ucentral-client", - "version": "2.3.7", + "version": "2.3.8", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ucentral-client", - "version": "2.3.7", + "version": "2.3.8", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -32,7 +32,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.96", + "ucentral-libs": "^0.9.97", "uuid": "^8.3.2" }, "devDependencies": { @@ -14842,9 +14842,9 @@ } }, "node_modules/ucentral-libs": { - "version": "0.9.96", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.96.tgz", - "integrity": "sha512-Ad2wd6XtQbERcwMtARUwbKiJLt1bTLbpkcvd47XmQC9cjTk/DwqTK4E2r5JLPMTsrFIkoSj5Se/xyz0Lpi9tyA==", + "version": "0.9.97", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.97.tgz", + "integrity": "sha512-LahvHclhnBNJxiXPXhGrsLBDpVk0uG/1D2ehZ5wHwxRjNumcpyUAQJ+ZAcxQehi6e0MLiKEk0I509f7kiOH4EQ==", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -27716,9 +27716,9 @@ } }, "ucentral-libs": { - "version": "0.9.96", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.96.tgz", - "integrity": "sha512-Ad2wd6XtQbERcwMtARUwbKiJLt1bTLbpkcvd47XmQC9cjTk/DwqTK4E2r5JLPMTsrFIkoSj5Se/xyz0Lpi9tyA==", + "version": "0.9.97", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.97.tgz", + "integrity": "sha512-LahvHclhnBNJxiXPXhGrsLBDpVk0uG/1D2ehZ5wHwxRjNumcpyUAQJ+ZAcxQehi6e0MLiKEk0I509f7kiOH4EQ==", "requires": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", diff --git a/package.json b/package.json index 00607f1..d993e7a 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucentral-client", - "version": "2.3.7", + "version": "2.3.8", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -26,7 +26,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.96", + "ucentral-libs": "^0.9.97", "uuid": "^8.3.2" }, "main": "index.js", From 0d7e2056f05bd1a325eeed58b07e2285187c68e5 Mon Sep 17 00:00:00 2001 From: Charles Date: Thu, 28 Oct 2021 14:21:17 -0400 Subject: [PATCH 7/7] Version 2.3.9 --- package-lock.json | 18 +++++++++--------- package.json | 4 ++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/package-lock.json b/package-lock.json index 9584282..8797cde 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "ucentral-client", - "version": "2.3.8", + "version": "2.3.9", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "ucentral-client", - "version": "2.3.8", + "version": "2.3.9", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -32,7 +32,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.97", + "ucentral-libs": "^0.9.98", "uuid": "^8.3.2" }, "devDependencies": { @@ -14842,9 +14842,9 @@ } }, "node_modules/ucentral-libs": { - "version": "0.9.97", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.97.tgz", - "integrity": "sha512-LahvHclhnBNJxiXPXhGrsLBDpVk0uG/1D2ehZ5wHwxRjNumcpyUAQJ+ZAcxQehi6e0MLiKEk0I509f7kiOH4EQ==", + "version": "0.9.98", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.98.tgz", + "integrity": "sha512-Fwn0sqFS2u5bIN5gtbslgAZnki2J4iz6ucGVJmKdvghm+E45+KYFC2yGWGNlBfBkKIsSDlSIIhQHFEo0JTTCZg==", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -27716,9 +27716,9 @@ } }, "ucentral-libs": { - "version": "0.9.97", - "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.97.tgz", - "integrity": "sha512-LahvHclhnBNJxiXPXhGrsLBDpVk0uG/1D2ehZ5wHwxRjNumcpyUAQJ+ZAcxQehi6e0MLiKEk0I509f7kiOH4EQ==", + "version": "0.9.98", + "resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.98.tgz", + "integrity": "sha512-Fwn0sqFS2u5bIN5gtbslgAZnki2J4iz6ucGVJmKdvghm+E45+KYFC2yGWGNlBfBkKIsSDlSIIhQHFEo0JTTCZg==", "requires": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", diff --git a/package.json b/package.json index d993e7a..e9a911f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ucentral-client", - "version": "2.3.8", + "version": "2.3.9", "dependencies": { "@coreui/coreui": "^3.4.0", "@coreui/icons": "^2.0.1", @@ -26,7 +26,7 @@ "react-tooltip": "^4.2.21", "react-widgets": "^5.1.1", "sass": "^1.35.1", - "ucentral-libs": "^0.9.97", + "ucentral-libs": "^0.9.98", "uuid": "^8.3.2" }, "main": "index.js",