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

Apply suggestions from code review

Browse Source 
Co-authored-by: shamoon <4887959+shamoon@users.noreply.github.com>
This commit is contained in:
rgon10 2024-03-31 23:29:43 -04:00 committed by GitHub
parent 7b93dc4847
commit e313ae5f41
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/widgets/services/truenas.md
View File

@ -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. 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 ```yaml
widget: widget:

6
src/utils/config/service-helpers.js
View File

@ -521,11 +521,7 @@ export function cleanServiceGroups(groups) {
} }
if (type === "truenas") { if (type === "truenas") {
if (enablePools !== undefined) cleanedService.widget.enablePools = JSON.parse(enablePools); if (enablePools !== undefined) cleanedService.widget.enablePools = JSON.parse(enablePools);
if (nasType) { cleanedService.widget.nasType = nasType ?? "scale";
cleanedService.widget.nasType = nasType;
} else {
cleanedService.widget.nasType = "scale";
}
} }
if (["diskstation", "qnap"].includes(type)) { if (["diskstation", "qnap"].includes(type)) {
if (volume) cleanedService.widget.volume = volume; if (volume) cleanedService.widget.volume = volume;

6
src/widgets/truenas/component.jsx
View File

@ -31,8 +31,6 @@ export default function Component({ service }) {
} }
const enablePools = widget?.enablePools && Array.isArray(poolsData) && poolsData.length > 0; const enablePools = widget?.enablePools && Array.isArray(poolsData) && poolsData.length > 0;
const scaleDeployment = widget?.nasType === "scale";
const coreDeployment = widget?.nasType === "core";
return ( return (
<> <>
@ -42,7 +40,7 @@ export default function Component({ service }) {
<Block label="truenas.alerts" value={t("common.number", { value: alertData.pending })} /> <Block label="truenas.alerts" value={t("common.number", { value: alertData.pending })} />
</Container> </Container>
{enablePools && {enablePools &&
scaleDeployment && widget?.nasType === "scale" &&
poolsData.map((pool) => ( poolsData.map((pool) => (
<ScalePool <ScalePool
key={pool.id} key={pool.id}
@ -53,7 +51,7 @@ export default function Component({ service }) {
/> />
))} ))}
{enablePools && {enablePools &&
coreDeployment && widget?.nasType === "core" &&
poolsData.map((pool) => <CorePool key={pool.id} name={pool.name} healthy={pool.healthy} data={pool.data} />)} poolsData.map((pool) => <CorePool key={pool.id} name={pool.name} healthy={pool.healthy} data={pool.data} />)}
</> </>
); );