From 5dede217c023914e00b1fd2fe1786b6ac6bf6b2c Mon Sep 17 00:00:00 2001
From: Johanna Szepanski <johanna.szepanski@softhouse.se>
Date: Wed, 4 Dec 2024 14:14:37 +0100
Subject: [PATCH] removed two way deps and unneccessary deos between details
view and admin
---
src/components/IOC/IOCAdmin/IOCAdmin.jsx | 21 +++++++--------------
src/views/IOC/IOCDetailsView.jsx | 23 +++--------------------
2 files changed, 10 insertions(+), 34 deletions(-)
diff --git a/src/components/IOC/IOCAdmin/IOCAdmin.jsx b/src/components/IOC/IOCAdmin/IOCAdmin.jsx
index 253d7c13..c739550d 100644
--- a/src/components/IOC/IOCAdmin/IOCAdmin.jsx
+++ b/src/components/IOC/IOCAdmin/IOCAdmin.jsx
@@ -1,41 +1,34 @@
+import { useState } from "react";
import { AdministerUndeployment } from "../AdministerUndeployment";
import { IOCDelete } from "../IOCDelete";
import { IOCDetailAdmin } from "../IOCDetailAdmin";
import { ChangeHostAdmin } from "../ChangeHostAdmin";
-export const IOCAdmin = ({
- ioc,
- getIOC,
- resetTab,
- buttonDisabled,
- setButtonDisabled
-}) => {
+export const IOCAdmin = ({ ioc }) => {
+ const [buttonDisabled, setButtonDisabled] = useState(ioc.operationInProgress);
return (
<>
<IOCDetailAdmin
ioc={ioc}
- getIOC={getIOC}
- resetTab={resetTab}
buttonDisabled={buttonDisabled}
- setButtonDisabled={setButtonDisabled}
+ setButtonDisabled={(value) => setButtonDisabled(value)}
/>
{ioc.activeDeployment ? (
<ChangeHostAdmin
ioc={ioc}
- getIOC={getIOC}
- resetTab={resetTab}
buttonDisabled={buttonDisabled}
- setButtonDisabled={setButtonDisabled}
+ setButtonDisabled={(value) => setButtonDisabled(value)}
/>
) : null}
<AdministerUndeployment
ioc={ioc}
buttonDisabled={buttonDisabled}
+ setButtonDisabled={(value) => setButtonDisabled(value)}
/>
<IOCDelete
ioc={ioc}
buttonDisabled={buttonDisabled}
- setButtonDisabled={setButtonDisabled}
+ setButtonDisabled={(value) => setButtonDisabled(value)}
/>
</>
);
diff --git a/src/views/IOC/IOCDetailsView.jsx b/src/views/IOC/IOCDetailsView.jsx
index 7ca29cba..e540a14e 100644
--- a/src/views/IOC/IOCDetailsView.jsx
+++ b/src/views/IOC/IOCDetailsView.jsx
@@ -13,26 +13,16 @@ import { IOCAdmin } from "../../components/IOC/IOCAdmin";
import { applicationTitle } from "../../components/common/Helper";
export function IOCDetailsView({ ioc }) {
+ const [tabIndex, setTabIndex] = useState(0);
const { setTitle } = useContext(GlobalAppBarContext);
- const [buttonDisabled, setButtonDisabled] = useState(false);
const navigate = useNavigate();
- const [tabIndex, setTabIndex] = useState(0);
-
- useEffect(() => {
- setButtonDisabled(Boolean(ioc?.operationInProgress));
- }, [ioc?.operationInProgress]);
-
useEffect(() => {
if (ioc) {
setTitle(applicationTitle(`IOC Details: ${ioc.namingName}`));
}
}, [ioc, setTitle]);
- const handleClick = () => {
- navigate(-1);
- };
-
const tabs = [
{
label: "Status",
@@ -57,14 +47,7 @@ export function IOCDetailsView({ ioc }) {
if (isPermittedAdmin) {
tabs.push({
label: "Admin",
- content: (
- <IOCAdmin
- ioc={ioc}
- resetTab={() => setTabIndex(0)}
- buttonDisabled={buttonDisabled}
- setButtonDisabled={setButtonDisabled}
- />
- )
+ content: <IOCAdmin ioc={ioc} />
});
}
@@ -90,7 +73,7 @@ export function IOCDetailsView({ ioc }) {
>
<IconButton
color="inherit"
- onClick={handleClick}
+ onClick={() => navigate(-1)}
size="large"
>
<ArrowBackIcon />
--
GitLab