wip bug fix root_dataset

CHANGELOG.md

@@ -1,3 +1,3 @@
-## cockpit zfs 0.1.0-4
+## cockpit zfs 0.1.0-5
 
-* wip bug fix for root_dataset property again
+* wip bug fixing for root_dataset property

manifest.json

@@ -4,7 +4,7 @@
     "title": "cockpit zfs",
     "prerelease": true,
     "version": "0.1.0",
-    "buildVersion": "4",
+    "buildVersion": "5",
     "author": "Jordan Keough <[email protected]>",
     "url": "https://github.com/45Drives/cockpit-zfs",
     "category": "utils",
@@ -39,7 +39,7 @@
     "changelog": {
         "urgency": "medium",
         "version": "0.1.0",
-        "buildVersion": "4",
+        "buildVersion": "5",
         "ignore": [],
         "date": null,
         "packager": "Jordan Keough <[email protected]>",

packaging/el8/main.spec

@@ -27,6 +27,8 @@ make DESTDIR=%{buildroot} install
 /usr/share/cockpit/zfs/*
 
 %changelog
+* Mon Mar 11 2024 Jordan Keough <[email protected]> 0.1.0-5
+- wip bug fixing for root_dataset property
 * Mon Mar 11 2024 Jordan Keough <[email protected]> 0.1.0-4
 - wip bug fix for root_dataset property again
 * Mon Mar 11 2024 Jordan Keough <[email protected]> 0.1.0-3

zfs/src/composables/loadData.ts

@@ -98,10 +98,10 @@ export async function loadDisksThenPools(disks, pools) {
 						free:  convertBytesToSize(parsedJSON[i].properties.free.parsed),
 						readOnly: parsedJSON[i].properties.readonly.parsed,
 						sector: parsedJSON[i].properties.ashift.rawvalue,
-						record: parsedJSON[i].root_dataset.properties.recordsize.value,
-						compression: parsedJSON[i].root_dataset.properties.compression.parsed,
-						deduplication: onOffToBool(parsedJSON[i].root_dataset.properties.dedup.parsed),
-						refreservationRawSize: parsedJSON[i].root_dataset.properties.refreservation.parsed,
+						record: parsedJSON[i].root_dataset.properties.recordsize.value ? parsedJSON[i].root_dataset.properties.recordsize.value : '',
+						compression: parsedJSON[i].root_dataset.properties.compression.parsed ? parsedJSON[i].root_dataset.properties.compression.parsed : false,
+						deduplication: onOffToBool(parsedJSON[i].root_dataset.properties.dedup.parsed) ? onOffToBool(parsedJSON[i].root_dataset.properties.dedup.parsed) : false,
+						refreservationRawSize: parsedJSON[i].root_dataset.properties.refreservation.parsed ? parsedJSON[i].root_dataset.properties.refreservation.parsed : 0,
 						autoExpand: parsedJSON[i].properties.autoexpand.parsed,
 						autoReplace: parsedJSON[i].properties.autoreplace.parsed,
 						autoTrim: onOffToBool(parsedJSON[i].properties.autotrim.parsed),