diff --git a/ui/src/components/pages/Cluster/partials/ClusterNamespaceListing/index.tsx b/ui/src/components/pages/Cluster/partials/ClusterNamespaceListing/index.tsx index 50e5d9efe..072ff033a 100644 --- a/ui/src/components/pages/Cluster/partials/ClusterNamespaceListing/index.tsx +++ b/ui/src/components/pages/Cluster/partials/ClusterNamespaceListing/index.tsx @@ -17,6 +17,7 @@ import { CRITICAL, HEALTHY, INACTIVE, + INACTIVE_STATUS, NO_PIPELINES, WARNING, WITH_PIPELINES, @@ -72,6 +73,8 @@ export function ClusterNamespaceListing({ return ns.pipelinesWarningCount > 0; } else if (healthFilter === CRITICAL) { return ns.pipelinesCriticalCount > 0; + } else if (healthFilter === INACTIVE_STATUS) { + return ns.pipelinesInactiveCount > 0; } else { return true; } diff --git a/ui/src/components/pages/Namespace/partials/NamespacePipelineListing/index.tsx b/ui/src/components/pages/Namespace/partials/NamespacePipelineListing/index.tsx index 2ed130e60..37c8fec79 100644 --- a/ui/src/components/pages/Namespace/partials/NamespacePipelineListing/index.tsx +++ b/ui/src/components/pages/Namespace/partials/NamespacePipelineListing/index.tsx @@ -34,7 +34,7 @@ import { DESC, FAILED, HEALTHY, - INACTIVE_STATTUS, + INACTIVE_STATUS, LAST_CREATED_SORT, LAST_UPDATED_SORT, PAUSED, @@ -54,7 +54,7 @@ export const HEALTH = [ HEALTHY, WARNING, CRITICAL, - INACTIVE_STATTUS, + INACTIVE_STATUS, UNKNOWN, ]; export const STATUS = [ diff --git a/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/SearchablePodsHeatMap/partials/PodsHeatMap/index.tsx b/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/SearchablePodsHeatMap/partials/PodsHeatMap/index.tsx index cdf0d5b33..e74a5ae13 100644 --- a/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/SearchablePodsHeatMap/partials/PodsHeatMap/index.tsx +++ b/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/SearchablePodsHeatMap/partials/PodsHeatMap/index.tsx @@ -136,6 +136,7 @@ export const PodsHeatMap = ({ container.cpuPercent || -1, 1 ), + color: "#ffffff" }} > {container.cpuPercent @@ -151,6 +152,7 @@ export const PodsHeatMap = ({ container.memoryPercent || -1, 1 ), + color: "#ffffff" }} > {container.memoryPercent diff --git a/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/SearchablePodsHeatMap/partials/PodsHeatMap/style.css b/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/SearchablePodsHeatMap/partials/PodsHeatMap/style.css index 82037c5f0..7a0640444 100644 --- a/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/SearchablePodsHeatMap/partials/PodsHeatMap/style.css +++ b/ui/src/components/pages/Pipeline/partials/Graph/partials/NodeInfo/partials/Pods/partials/SearchablePodsHeatMap/partials/PodsHeatMap/style.css @@ -22,6 +22,7 @@ .hexagon-tooltip { transform: translate(10%, -75%); + z-index: 10; } .hexagon-tooltip-table { diff --git a/ui/src/utils/index.tsx b/ui/src/utils/index.tsx index 9377bafc2..38cdff2df 100644 --- a/ui/src/utils/index.tsx +++ b/ui/src/utils/index.tsx @@ -18,7 +18,7 @@ export const ALL = "All"; export const RUNNING = "Running"; export const ACTIVE = "Running"; export const INACTIVE = "Not-Running"; -export const INACTIVE_STATTUS = "inactive"; +export const INACTIVE_STATUS = "inactive"; export const HEALTHY = "healthy"; export const WARNING = "warning"; export const CRITICAL0 = "critical0"; @@ -241,7 +241,7 @@ export const IconsStatusMap = { [PAUSED]: circleDash, [ACTIVE]: circleCheck, [INACTIVE]: circleDash, - [INACTIVE_STATTUS]: circleDash, + [INACTIVE_STATUS]: circleDash, [HEALTHY]: heartFill, [WARNING]: warning, [CRITICAL]: critical, @@ -268,7 +268,7 @@ export const StatusString: StatusStringType = { [STOPPED]: "Stopped", [ACTIVE]: "Running", [INACTIVE]: "Inactive", - [INACTIVE_STATTUS]: "Inactive", + [INACTIVE_STATUS]: "Inactive", [HEALTHY]: "Healthy", [WARNING]: "Warning", [CRITICAL]: "Critical",