From fe257c0ccfd940e9c29d4e20f04dee6f0929ef06 Mon Sep 17 00:00:00 2001
From: Domonkos Gulyas <domonkos.gulyas@ess.edu>
Date: Fri, 19 Jul 2024 13:57:50 +0200
Subject: [PATCH] CE-2979: Fix NetBox link in the host details page
---
src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js | 2 +-
src/components/IOC/CreateIOC/CreateIOC.js | 4 ++--
src/components/IOC/IOCDeployDialog/IOCDeployDialog.js | 2 +-
src/components/IOC/IOCDetailAdmin/IOCDetailAdmin.js | 4 ++--
src/views/host/details/HostDetailsView.js | 8 ++++----
5 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js b/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
index 014ef892..838b2cb7 100644
--- a/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
+++ b/src/components/IOC/ChangeHostAdmin/ChangeHostAdmin.js
@@ -177,7 +177,7 @@ export default function ChangeHostAdmin({
<Autocomplete
autoHighlight
id="host"
- options={query ? (hosts?.netBoxHosts ?? []) : []}
+ options={query ? hosts?.netBoxHosts ?? [] : []}
loading={loadingHosts}
clearOnBlur={false}
value={host}
diff --git a/src/components/IOC/CreateIOC/CreateIOC.js b/src/components/IOC/CreateIOC/CreateIOC.js
index 30794c04..eb3ff5c9 100644
--- a/src/components/IOC/CreateIOC/CreateIOC.js
+++ b/src/components/IOC/CreateIOC/CreateIOC.js
@@ -138,7 +138,7 @@ export function CreateIOC() {
autoHighlight
id="nameAutocomplete"
value={namingEntity}
- options={nameQuery ? (names ?? []) : []}
+ options={nameQuery ? names ?? [] : []}
loading={loadingNames}
clearOnBlur={false}
getOptionLabel={(option) => option?.name ?? ""}
@@ -175,7 +175,7 @@ export function CreateIOC() {
autoHighlight
id="gitId"
value={gitProject}
- options={repoQuery || gitProject ? (allowedGitProjects ?? []) : []}
+ options={repoQuery || gitProject ? allowedGitProjects ?? [] : []}
loading={loadingAllowedGitProjects}
clearOnBlur={false}
getOptionLabel={(option) => {
diff --git a/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js
index 3caf691c..9edfc37f 100644
--- a/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js
+++ b/src/components/IOC/IOCDeployDialog/IOCDeployDialog.js
@@ -167,7 +167,7 @@ export function IOCDeployDialog({
<Autocomplete
autoHighlight
id="host"
- options={query ? (hosts?.netBoxHosts ?? []) : []}
+ options={query ? hosts?.netBoxHosts ?? [] : []}
loading={loadingHosts}
clearOnBlur={false}
value={host}
diff --git a/src/components/IOC/IOCDetailAdmin/IOCDetailAdmin.js b/src/components/IOC/IOCDetailAdmin/IOCDetailAdmin.js
index 3d23d976..06817fe3 100644
--- a/src/components/IOC/IOCDetailAdmin/IOCDetailAdmin.js
+++ b/src/components/IOC/IOCDetailAdmin/IOCDetailAdmin.js
@@ -152,7 +152,7 @@ export default function IOCDetailAdmin({
<Autocomplete
autoHighlight
id="namingName"
- options={nameQuery ? (names ?? []) : []}
+ options={nameQuery ? names ?? [] : []}
loading={loading}
clearOnBlur={false}
defaultValue={name}
@@ -204,7 +204,7 @@ export default function IOCDetailAdmin({
<Autocomplete
autoHighlight
id="gitId"
- options={repoQuery || gitId ? (allowedGitProjects ?? []) : []}
+ options={repoQuery || gitId ? allowedGitProjects ?? [] : []}
loading={loading}
clearOnBlur={false}
defaultValue={{
diff --git a/src/views/host/details/HostDetailsView.js b/src/views/host/details/HostDetailsView.js
index 2aa292d4..45214a43 100644
--- a/src/views/host/details/HostDetailsView.js
+++ b/src/views/host/details/HostDetailsView.js
@@ -128,15 +128,15 @@ export function HostDetailsView({ hostId, host, status }) {
<ExternalLink
href={
host.vm
- ? `${env.NETBOX_ADDRESS}/virtualization/virtual-machines/${host.hostId}`
- : `${env.NETBOX_ADDRESS}/dcim/devices/${host.hostId}`
+ ? `${env.NETBOX_ADDRESS}/virtualization/virtual-machines/${host.id}`
+ : `${env.NETBOX_ADDRESS}/dcim/devices/${host.id}`
}
aria-label="Host Configuration"
>
{" "}
{host.vm
- ? `${env.NETBOX_ADDRESS}/virtualization/virtual-machines/${host.hostId}`
- : `${env.NETBOX_ADDRESS}/dcim/devices/${host.hostId}`}
+ ? `${env.NETBOX_ADDRESS}/virtualization/virtual-machines/${host.id}`
+ : `${env.NETBOX_ADDRESS}/dcim/devices/${host.id}`}
</ExternalLink>
),
"Host Metrics": (
--
GitLab