OpenSource/homepage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QNAP widget syntax corrections, translate invalid

Browse Source
This commit is contained in:
shamoon 2023-05-20 10:09:42 -07:00
parent 9fa48bc6e5
commit b1a9761737
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
public/locales/en/common.json
View File

@ -176,7 +176,8 @@
"memUsage": "MEM Usage", "memUsage": "MEM Usage",
"systemTempC": "System Temp", "systemTempC": "System Temp",
"poolUsage": "Pool Usage", "poolUsage": "Pool Usage",
"volumeUsage": "Volume Usage" "volumeUsage": "Volume Usage",
"invalid": "Invalid"
}, },
"deluge": { "deluge": {
"download": "Download", "download": "Download",

19
src/widgets/qnap/component.jsx
View File

@ -36,23 +36,22 @@ export default function Component({ service }) {
let volumeFreeSize = 0; let volumeFreeSize = 0;
let validVolume = true; let validVolume = true;
if(Array.isArray(statusData.volume.volumeUseList.volumeUse)){ if (Array.isArray(statusData.volume.volumeUseList.volumeUse)) {
if(widget.volume){ if (widget.volume) {
const volumeSelected = statusData.volume.volumeList.volume.findIndex(vl => vl.volumeLabel._cdata === widget.volume); const volumeSelected = statusData.volume.volumeList.volume.findIndex(vl => vl.volumeLabel._cdata === widget.volume);
if(volumeSelected !== -1){ if (volumeSelected !== -1) {
volumeTotalSize = statusData.volume.volumeUseList.volumeUse[volumeSelected].total_size._cdata; volumeTotalSize = statusData.volume.volumeUseList.volumeUse[volumeSelected].total_size._cdata;
volumeFreeSize = statusData.volume.volumeUseList.volumeUse[volumeSelected].free_size._cdata; volumeFreeSize = statusData.volume.volumeUseList.volumeUse[volumeSelected].free_size._cdata;
} } else {
else{
validVolume = false; validVolume = false;
} }
}else{ } else {
statusData.volume.volumeUseList.volumeUse.forEach((volume) => { statusData.volume.volumeUseList.volumeUse.forEach((volume) => {
volumeTotalSize += Number(volume.total_size._cdata); volumeTotalSize += parseInt(volume.total_size._cdata, 10);
volumeFreeSize += Number(volume.free_size._cdata); volumeFreeSize += parseInt(volume.free_size._cdata, 10);
}); });
} }
}else{ } else {
volumeTotalSize = statusData.volume.volumeUseList.volumeUse.total_size._cdata; volumeTotalSize = statusData.volume.volumeUseList.volumeUse.total_size._cdata;
volumeFreeSize = statusData.volume.volumeUseList.volumeUse.free_size._cdata; volumeFreeSize = statusData.volume.volumeUseList.volumeUse.free_size._cdata;
} }
@ -73,7 +72,7 @@ export default function Component({ service }) {
/> />
<Block <Block
label={(widget.volume) ? "qnap.volumeUsage" : "qnap.poolUsage" } label={(widget.volume) ? "qnap.volumeUsage" : "qnap.poolUsage" }
value={(validVolume) ? t("common.percent", { value: (((volumeTotalSize - volumeFreeSize) / volumeTotalSize) * 100).toFixed(0) }) : "invalid"} value={(validVolume) ? t("common.percent", { value: (((volumeTotalSize - volumeFreeSize) / volumeTotalSize) * 100).toFixed(0) }) : t("qnap.invalid") }
/> />
</Container> </Container>
); );