scottk/wlan-cloud-ucentralgw-ui
1
0
Fork 0
mirror of https://github.com/Telecominfraproject/wlan-cloud-ucentralgw-ui.git synced 2025-10-30 02:12:33 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

Merge pull request #51 from stephb9959/main

Browse Source 
Version 2.2.2
This commit is contained in:
Charles
2021-09-28 14:59:12 -04:00
committed by GitHub
parent d48925f9ba 818bdd67ba
commit 601c369f2d
8 changed files with 24 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
package-lock.json generated
View File

@@ -1,12 +1,12 @@
{
"name": "ucentral-client",
"version": "2.2.1",
"version": "2.2.2",
"lockfileVersion": 2,
"requires": true,
"packages": {
"": {
"name": "ucentral-client",
"version": "2.2.1",
"version": "2.2.2",
"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.39",
"ucentral-libs": "^0.9.41",
"uuid": "^8.3.2"
},
"devDependencies": {
@@ -14812,9 +14812,9 @@
}
},
"node_modules/ucentral-libs": {
"version": "0.9.39",
"resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.39.tgz",
"integrity": "sha512-BGsT0tdOyJUNNIjD6y1gWATcyShhR/2Qik77FqF9m9efiLEbz7MiH+8IOxnup8X6gFt6nyTNqPZIzbXYuw48og==",
"version": "0.9.41",
"resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.41.tgz",
"integrity": "sha512-TXcxnZk9ornuaIN+vtRVJ/U3d5Dh76l6r3suEd/aLGlXvgW9iUwSqgBkA5kj/uV0wJXrZqxIr+hVsFndYvmtQQ==",
"dependencies": {
"@coreui/coreui": "^3.4.0",
"@coreui/icons": "^2.0.1",
@@ -27653,9 +27653,9 @@
}
},
"ucentral-libs": {
"version": "0.9.39",
"resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.39.tgz",
"integrity": "sha512-BGsT0tdOyJUNNIjD6y1gWATcyShhR/2Qik77FqF9m9efiLEbz7MiH+8IOxnup8X6gFt6nyTNqPZIzbXYuw48og==",
"version": "0.9.41",
"resolved": "https://registry.npmjs.org/ucentral-libs/-/ucentral-libs-0.9.41.tgz",
"integrity": "sha512-TXcxnZk9ornuaIN+vtRVJ/U3d5Dh76l6r3suEd/aLGlXvgW9iUwSqgBkA5kj/uV0wJXrZqxIr+hVsFndYvmtQQ==",
"requires": {
"@coreui/coreui": "^3.4.0",
"@coreui/icons": "^2.0.1",

4
package.json
View File

@@ -1,6 +1,6 @@
{
"name": "ucentral-client",
"version": "2.2.1",
"version": "2.2.2",
"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.39",
"ucentral-libs": "^0.9.41",
"uuid": "^8.3.2"
},
"main": "index.js",

2
public/locales/de/translation.json
View File

@@ -468,7 +468,7 @@
"os": "Betriebssystem",
"processors": "Prozessoren",
"reload": "Neu laden",
"reload_subsystems": "Subsysteme neu laden",
"reload_subsystems": "Subsysteme",
"subsystems": "Subsysteme",
"success_reload": "Reload-Befehl erfolgreich gesendet!"
},

2
public/locales/en/translation.json
View File

@@ -468,7 +468,7 @@
"os": "Operation System",
"processors": "Processors",
"reload": "Reload",
"reload_subsystems": "Reload Subsystems",
"reload_subsystems": "Reload",
"subsystems": "Subsystems",
"success_reload": "Reload command successfully submitted!"
},

2
public/locales/es/translation.json
View File

@@ -468,7 +468,7 @@
"os": "sistema operativo",
"processors": "Procesadores",
"reload": "Recargar",
"reload_subsystems": "Recargar subsistemas",
"reload_subsystems": "Recargar",
"subsystems": "Subsistemas",
"success_reload": "¡El comando de recarga se envió correctamente!"
},

2
public/locales/fr/translation.json
View File

@@ -468,7 +468,7 @@
"os": "le système d'exploitation",
"processors": "Processeurs",
"reload": "Recharger",
"reload_subsystems": "Recharger les sous-systèmes",
"reload_subsystems": "Recharger",
"subsystems": "Sous-systèmes",
"success_reload": "Recharger la commande soumise avec succès !"
},

2
public/locales/pt/translation.json
View File

@@ -468,7 +468,7 @@
"os": "Sistema Operacional",
"processors": "Processadores",
"reload": "Recarregar",
"reload_subsystems": "Recarregar subsistemas",
"reload_subsystems": "Recarregar",
"subsystems": "Subsistemas",
"success_reload": "Comando de recarregamento enviado com sucesso!"
},

16
src/pages/SystemPage/index.js
View File

@@ -22,6 +22,7 @@ const SystemPage = () => {
uptime: t('common.unknown'),
version: t('common.unknown'),
start: t('common.unknown'),
certificates: [],
subsystems: [],
};
@@ -41,7 +42,9 @@ const SystemPage = () => {
return Promise.all([getInfo, getSubsystems])
.then(([newInfo, newSubs]) => {
systemInfo.uptime = secondsToDetailed(
let newSystem = { ...systemInfo };
newSystem = { ...newSystem, ...newInfo.data, ...newSubs.data };
newSystem.uptime = secondsToDetailed(
newInfo.data.uptime,
t('common.day'),
t('common.days'),
@@ -52,17 +55,14 @@ const SystemPage = () => {
t('common.second'),
t('common.seconds'),
);
systemInfo.hostname = newInfo.data.hostname;
systemInfo.os = newInfo.data.os;
systemInfo.processors = newInfo.data.processors;
systemInfo.version = newInfo.data.version;
systemInfo.start = prettyDate(newInfo.data.start);
systemInfo.subsystems = newSubs.data.list.sort((a, b) => {
newSystem.start = prettyDate(newInfo.data.start);
newSystem.subsystems = newSubs.data.list.sort((a, b) => {
if (a < b) return -1;
if (a > b) return 1;
return 0;
});
return systemInfo;
return newSystem;
})
.catch(() => systemInfo);
};