From 28e95517c87c637c8ca86ddf8c28f61548cc0198 Mon Sep 17 00:00:00 2001
From: Johanna Szepanski <johanna.szepanski@ess.eu>
Date: Tue, 28 Nov 2023 11:43:34 +0000
Subject: [PATCH] Resolve CE-2232 "Replace local iconbadge"
---
src/components/IOC/IOCBadge/IOCBadge.js | 4 +-
src/components/Job/JobBadge.js | 4 +-
src/components/common/Badge/IconBadge.js | 65 ------------------------
src/components/common/Badge/index.js | 4 --
src/components/host/HostBadge.js | 4 +-
src/components/records/RecordBadge.js | 4 +-
6 files changed, 8 insertions(+), 77 deletions(-)
delete mode 100644 src/components/common/Badge/IconBadge.js
delete mode 100644 src/components/common/Badge/index.js
diff --git a/src/components/IOC/IOCBadge/IOCBadge.js b/src/components/IOC/IOCBadge/IOCBadge.js
index afe564ba..5a4511ef 100644
--- a/src/components/IOC/IOCBadge/IOCBadge.js
+++ b/src/components/IOC/IOCBadge/IOCBadge.js
@@ -1,5 +1,5 @@
import React from "react";
-import { IconBadge } from "../../common/Badge/IconBadge";
+import { IconBadge } from "@ess-ics/ce-ui-common";
import { IOCStatusIcon } from "../IOCIcons";
export function IOCBadge({ ioc, ...rest }) {
@@ -7,7 +7,7 @@ export function IOCBadge({ ioc, ...rest }) {
<IconBadge
icon={<IOCStatusIcon ioc={ioc} />}
title={ioc.namingName ?? ioc.name}
- subheader={ioc.activeDeployment?.host?.fqdn || "---"}
+ subtitle={ioc.activeDeployment?.host?.fqdn || "---"}
{...rest}
/>
);
diff --git a/src/components/Job/JobBadge.js b/src/components/Job/JobBadge.js
index 4ea90fdb..f9a347a1 100644
--- a/src/components/Job/JobBadge.js
+++ b/src/components/Job/JobBadge.js
@@ -1,5 +1,5 @@
import React from "react";
-import { IconBadge } from "../common/Badge/IconBadge";
+import { IconBadge } from "@ess-ics/ce-ui-common";
import { JobTypeIcon } from "./JobIcons";
import { InternalLink } from "@ess-ics/ce-ui-common";
@@ -24,7 +24,7 @@ export function JobBadge({ operation }) {
</>
}
title={linkToIoc}
- subheader={operation.host.fqdn || "---"}
+ subtitle={operation.host.fqdn || "---"}
/>
);
}
diff --git a/src/components/common/Badge/IconBadge.js b/src/components/common/Badge/IconBadge.js
deleted file mode 100644
index 53d22469..00000000
--- a/src/components/common/Badge/IconBadge.js
+++ /dev/null
@@ -1,65 +0,0 @@
-import { Grid, Typography } from "@mui/material";
-import React from "react";
-
-export function IconBadge({ icon, secondaryIcon, title, subheader, ...rest }) {
- return (
- <Grid
- container
- alignItems="center"
- {...rest}
- >
- <Grid
- item
- xs={3}
- sm={2}
- md={1}
- >
- <Grid
- container
- justifyContent="center"
- direction="column"
- alignItems="center"
- >
- {icon}
- {secondaryIcon}
- </Grid>
- </Grid>
- <Grid
- item
- xs={9}
- sm={10}
- md={11}
- >
- <Grid
- container
- justifyContent="flex-start"
- >
- <Grid
- item
- xs={12}
- zeroMinWidth
- >
- <Typography
- noWrap
- color="textPrimary"
- >
- {title}
- </Typography>
- </Grid>
- <Grid
- item
- xs={12}
- zeroMinWidth
- >
- <Typography
- noWrap
- color="textSecondary"
- >
- {subheader}
- </Typography>
- </Grid>
- </Grid>
- </Grid>
- </Grid>
- );
-}
diff --git a/src/components/common/Badge/index.js b/src/components/common/Badge/index.js
deleted file mode 100644
index 557989e2..00000000
--- a/src/components/common/Badge/index.js
+++ /dev/null
@@ -1,4 +0,0 @@
-import { IconBadge } from "./IconBadge";
-
-export { IconBadge };
-export default IconBadge;
diff --git a/src/components/host/HostBadge.js b/src/components/host/HostBadge.js
index 80e6132f..64e6c433 100644
--- a/src/components/host/HostBadge.js
+++ b/src/components/host/HostBadge.js
@@ -1,5 +1,5 @@
import React from "react";
-import { IconBadge } from "../common/Badge/IconBadge";
+import { IconBadge } from "@ess-ics/ce-ui-common";
import { HostStatusIcon } from "./HostIcons";
import { extractMainNetwork } from "../common/Helper";
@@ -8,7 +8,7 @@ export function HostBadge({ host, ...rest }) {
<IconBadge
icon={<HostStatusIcon host={host} />}
title={host.csEntryHost?.fqdn}
- subheader={extractMainNetwork(host?.csEntryHost?.interfaces, "---")}
+ subtitle={extractMainNetwork(host?.csEntryHost?.interfaces, "---")}
{...rest}
/>
);
diff --git a/src/components/records/RecordBadge.js b/src/components/records/RecordBadge.js
index 286e976f..664ce2bd 100644
--- a/src/components/records/RecordBadge.js
+++ b/src/components/records/RecordBadge.js
@@ -1,5 +1,5 @@
import React from "react";
-import { IconBadge } from "../common/Badge/IconBadge";
+import { IconBadge } from "@ess-ics/ce-ui-common";
import { RecordStatusIcon } from "./RecordIcons";
export function RecordBadge({ record, ...rest }) {
@@ -7,7 +7,7 @@ export function RecordBadge({ record, ...rest }) {
<IconBadge
icon={<RecordStatusIcon record={record} />}
title={record.name}
- subheader={record.iocName}
+ subtitle={record.iocName}
{...rest}
/>
);
--
GitLab