From e313ae5f410f3a0138be3965f635189230509983 Mon Sep 17 00:00:00 2001
From: rgon10 <3789272+rgon10@users.noreply.github.com>
Date: Sun, 31 Mar 2024 23:29:43 -0400
Subject: [PATCH] Apply suggestions from code review
Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>
---
docs/widgets/services/truenas.md | 2 +-
src/utils/config/service-helpers.js | 6 +-----
src/widgets/truenas/component.jsx | 6 ++----
3 files changed, 4 insertions(+), 10 deletions(-)
diff --git a/docs/widgets/services/truenas.md b/docs/widgets/services/truenas.md
index 8933f656e..029923ecd 100644
--- a/docs/widgets/services/truenas.md
+++ b/docs/widgets/services/truenas.md
@@ -11,7 +11,7 @@ To create an API Key, follow [the official TrueNAS documentation](https://www.tr
A detailed pool listing is disabled by default, but can be enabled with the `enablePools` option.
-The Scale and Core API's provide information on the pools in different manners. The `nasType` option choses which API response parsing should be used.
+TrueNAS Scale and Core APIs differ, the optional `nasType` parameter is needed if using the `enablePools` option.
```yaml
widget:
diff --git a/src/utils/config/service-helpers.js b/src/utils/config/service-helpers.js
index 7634f41c8..07d1e2bf7 100644
--- a/src/utils/config/service-helpers.js
+++ b/src/utils/config/service-helpers.js
@@ -521,11 +521,7 @@ export function cleanServiceGroups(groups) {
}
if (type === "truenas") {
if (enablePools !== undefined) cleanedService.widget.enablePools = JSON.parse(enablePools);
- if (nasType) {
- cleanedService.widget.nasType = nasType;
- } else {
- cleanedService.widget.nasType = "scale";
- }
+ cleanedService.widget.nasType = nasType ?? "scale";
}
if (["diskstation", "qnap"].includes(type)) {
if (volume) cleanedService.widget.volume = volume;
diff --git a/src/widgets/truenas/component.jsx b/src/widgets/truenas/component.jsx
index 119bb5081..29c31adf3 100644
--- a/src/widgets/truenas/component.jsx
+++ b/src/widgets/truenas/component.jsx
@@ -31,8 +31,6 @@ export default function Component({ service }) {
}
const enablePools = widget?.enablePools && Array.isArray(poolsData) && poolsData.length > 0;
- const scaleDeployment = widget?.nasType === "scale";
- const coreDeployment = widget?.nasType === "core";
return (
<>
@@ -42,7 +40,7 @@ export default function Component({ service }) {
{enablePools &&
- scaleDeployment &&
+ widget?.nasType === "scale" &&
poolsData.map((pool) => (
))}
{enablePools &&
- coreDeployment &&
+ widget?.nasType === "core" &&
poolsData.map((pool) => )}
>
);