PMM-13348 Fix status presentation.

percona · Sep 10, 2024 · c3f81c3 · c3f81c3
1 parent 2e456a6
commit c3f81c3
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/public/app/percona/inventory/Tabs/Agents.tsx b/public/app/percona/inventory/Tabs/Agents.tsx
@@ -33,7 +33,7 @@ import { GET_AGENTS_CANCEL_TOKEN, GET_NODES_CANCEL_TOKEN, GET_SERVICES_CANCEL_TO
 import { Messages } from '../Inventory.messages';
 import { InventoryService } from '../Inventory.service';
 
-import { beautifyAgentType, getAgentStatusColor, toAgentModel } from './Agents.utils';
+import { beautifyAgentType, getAgentStatusColor, getBadgeTextForAgentStatus, toAgentModel } from './Agents.utils';
 import { formatNodeId } from './Nodes.utils';
 import { getStyles } from './Tabs.styles';
 
@@ -64,7 +64,7 @@ export const Agents: FC<GrafanaRouteComponentProps<{ serviceId: string; nodeId:
         Header: Messages.agents.columns.status,
         accessor: 'status',
         Cell: ({ value }: { value: ServiceAgentStatus }) => (
-          <Badge text={capitalizeText(value)} color={getAgentStatusColor(value)} />
+          <Badge text={getBadgeTextForAgentStatus(value)} color={getAgentStatusColor(value)} />
         ),
         type: FilterFieldTypes.DROPDOWN,
         options: [

diff --git a/public/app/percona/inventory/Tabs/Agents.utils.ts b/public/app/percona/inventory/Tabs/Agents.utils.ts
@@ -1,4 +1,5 @@
 import { BadgeColor } from '@grafana/ui';
+import { capitalizeText } from "app/percona/shared/helpers/capitalizeText";
 import { payloadToCamelCase } from 'app/percona/shared/helpers/payloadToCamelCase';
 
 import { Agent, AgentType, ServiceAgentPayload, ServiceAgentStatus } from '../Inventory.types';
@@ -53,4 +54,8 @@ export const beautifyAgentType = (type: AgentType): string =>
   type.replace(/^\w/, (c) => c.toUpperCase()).replace(/[_-]/g, ' ');
 
 export const getAgentStatusColor = (status: ServiceAgentStatus): BadgeColor =>
-  status === ServiceAgentStatus.STARTING || status === ServiceAgentStatus.RUNNING ? 'green' : 'red';
+  status === ServiceAgentStatus.STARTING || status === ServiceAgentStatus.RUNNING ? 'green' : status === ServiceAgentStatus.UNKNOWN ? 'gray' : 'red';
+
+export const getBadgeTextForAgentStatus = (status: ServiceAgentStatus): string => {
+  return capitalizeText(status.replace('_', ' '));
+};