From f10c6592be58c0a079ab7c752155c8ce612dde5f Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips <jephilli@redhat.com>
Date: Wed, 5 Apr 2023 11:50:52 -0400
Subject: [PATCH] fix(topology): use badgeTextColor when set

---
 packages/demo-app-ts/src/Demo.css                          | 7 +++++++
 packages/demo-app-ts/src/utils/styleUtils.ts               | 6 ++----
 packages/module/src/components/nodes/labels/LabelBadge.tsx | 2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/packages/demo-app-ts/src/Demo.css b/packages/demo-app-ts/src/Demo.css
index c782129b..961975d9 100644
--- a/packages/demo-app-ts/src/Demo.css
+++ b/packages/demo-app-ts/src/Demo.css
@@ -65,3 +65,10 @@
   --pf-c-page__main-section--PaddingLeft: 0;
   --pf-c-page__main-section--PaddingBottom: 0;
 }
+
+.topology-demo-badge > rect {
+  fill: var(--pf-global--palette--red-100);
+}
+.topology-demo-badge > text {
+  fill: var(--pf-global--palette--gold-100);
+}
diff --git a/packages/demo-app-ts/src/utils/styleUtils.ts b/packages/demo-app-ts/src/utils/styleUtils.ts
index 2b0c4a6a..a6702bbd 100644
--- a/packages/demo-app-ts/src/utils/styleUtils.ts
+++ b/packages/demo-app-ts/src/utils/styleUtils.ts
@@ -274,7 +274,7 @@ export const createBadgeNodes = (options: {
       x: columnWidth * 2,
       y: (options.row - 1) * BOTTOM_LABEL_ROW_HEIGHT,
       badgeColor: '#ace12e',
-      badgeTextColor: '#0f280d',
+      badgeTextColor: '#ff0000',
       badgeBorderColor: '#486b00',
       labelIconClass: options.showIconClass ? logos.get('icon-nodejs') : undefined,
       truncateLength: 13,
@@ -324,9 +324,7 @@ export const createBadgeNodes = (options: {
       shape: NodeShape.octagon,
       x: columnWidth * 5,
       y: (options.row - 1) * BOTTOM_LABEL_ROW_HEIGHT,
-      badgeColor: '#ace12e',
-      badgeTextColor: '#0f280d',
-      badgeBorderColor: '#486b00',
+      badgeClassName: 'topology-demo-badge',
       labelIconClass: options.showIconClass ? logos.get('icon-jenkins') : undefined,
       truncateLength: 13,
       ...options
diff --git a/packages/module/src/components/nodes/labels/LabelBadge.tsx b/packages/module/src/components/nodes/labels/LabelBadge.tsx
index cb304800..c465de78 100644
--- a/packages/module/src/components/nodes/labels/LabelBadge.tsx
+++ b/packages/module/src/components/nodes/labels/LabelBadge.tsx
@@ -54,7 +54,7 @@ const LabelBadge = React.forwardRef<SVGRectElement, LabelBadgeProps>(
       <g className={classes} transform={`translate(${x}, ${y})`}>
         {rect}
         <text
-          fill={badgeTextColor || badgeClassName ? undefined : defaultBadgeTextColor.value}
+          fill={badgeTextColor || badgeClassName ? badgeTextColor : defaultBadgeTextColor.value}
           ref={textRef}
           x={width / 2 + paddingX}
           y={height / 2}