Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions public/app/percona/dbaas/DBaaS.messages.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ export const Messages = {
[KubernetesClusterStatus.ok]: 'Active',
[KubernetesClusterStatus.unavailable]: 'Unavailable',
[KubernetesClusterStatus.invalid]: 'Invalid',
[KubernetesClusterStatus.provisioning]: 'Provisioning',
},
updateOperatorModal: {
cancel: 'Cancel',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,14 @@ import React, { FC, useCallback } from 'react';

import { config } from '@grafana/runtime';
import { Messages } from 'app/percona/dbaas/DBaaS.messages';
import { MultipleActions, Action } from 'app/percona/dbaas/components/MultipleActions';
import { Action, MultipleActions } from 'app/percona/dbaas/components/MultipleActions';

import { Kubernetes } from '../Kubernetes.types';
import { KubernetesClusterStatus } from '../KubernetesClusterStatus/KubernetesClusterStatus.types';
import { hasActiveOperator } from '../OperatorStatusItem/KubernetesOperatorStatus/KubernetesOperatorStatus.utils';

import { styles } from './KubernetesClusterActions.styles';
import { DBClusterActionsProps } from './KubernetesClusterActions.types';

export const KubernetesClusterActions: FC<DBClusterActionsProps> = ({
kubernetesCluster,
setSelectedCluster,
Expand All @@ -30,6 +30,7 @@ export const KubernetesClusterActions: FC<DBClusterActionsProps> = ({
},
{
content: Messages.kubernetes.showConfiguration,
disabled: kubernetesCluster.status === KubernetesClusterStatus.provisioning,
action: () => {
setSelectedCluster(kubernetesCluster);
setViewConfigModalVisible(true);
Expand All @@ -40,7 +41,8 @@ export const KubernetesClusterActions: FC<DBClusterActionsProps> = ({
if (isAdmin) {
actions.push({
content: Messages.kubernetes.manageComponents,
disabled: !hasActiveOperator(kubernetesCluster),
disabled:
!hasActiveOperator(kubernetesCluster) || kubernetesCluster.status === KubernetesClusterStatus.provisioning,
action: () => {
setSelectedCluster(kubernetesCluster);
setManageComponentsModalVisible(true);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ export const STATUS_DATA_QA = {
[KubernetesClusterStatus.invalid]: 'invalid',
[KubernetesClusterStatus.ok]: 'ok',
[KubernetesClusterStatus.unavailable]: 'unavailable',
[KubernetesClusterStatus.provisioning]: 'provisioning',
};
Original file line number Diff line number Diff line change
Expand Up @@ -4,12 +4,14 @@ export enum KubernetesClusterStatus {
invalid = 'KUBERNETES_CLUSTER_STATUS_INVALID',
ok = 'KUBERNETES_CLUSTER_STATUS_OK',
unavailable = 'KUBERNETES_CLUSTER_STATUS_UNAVAILABLE',
provisioning = 'KUBERNETES_CLUSTER_STATUS_PROVISIONING',
}

export const KubernetesClusterStatusColors: Record<KubernetesClusterStatus, BadgeColor> = {
[KubernetesClusterStatus.ok]: 'green',
[KubernetesClusterStatus.invalid]: 'red',
[KubernetesClusterStatus.unavailable]: 'blue',
[KubernetesClusterStatus.provisioning]: 'orange',
};

export interface KubernetesClusterStatusProps {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,10 @@ import React, { FC } from 'react';
import { useStyles } from '@grafana/ui';
import { OPERATOR_FULL_LABELS } from 'app/percona/shared/core';

import { KubernetesClusterStatus } from '../KubernetesClusterStatus/KubernetesClusterStatus.types';

import { KubernetesOperatorStatus } from './KubernetesOperatorStatus/KubernetesOperatorStatus';
import { KubernetesOperatorStatus as Status } from './KubernetesOperatorStatus/KubernetesOperatorStatus.types';
import { getStyles } from './OperatorStatusItem.styles';
import { OperatorStatusItemProps } from './OperatorStatusItem.types';
import { buildOperatorLabel } from './OperatorStatusItem.utils';
Expand All @@ -19,21 +22,28 @@ export const OperatorStatusItem: FC<OperatorStatusItemProps> = ({
}) => {
const styles = useStyles(getStyles);

const showStatus = !(
kubernetes.status === KubernetesClusterStatus.provisioning && operator.status === Status.unavailable
);

return (
<div className={styles.connectionItemWrapper} data-testid={dataTestId}>
<span className={styles.connectionItemLabel} title={OPERATOR_FULL_LABELS[databaseType]}>
{buildOperatorLabel(operator, databaseType)}:
</span>
<span className={styles.connectionItemValue}>
<KubernetesOperatorStatus
operator={operator}
databaseType={databaseType}
kubernetes={kubernetes}
setSelectedCluster={setSelectedCluster}
setOperatorToUpdate={setOperatorToUpdate}
setUpdateOperatorModalVisible={setUpdateOperatorModalVisible}
/>
{buildOperatorLabel(operator, databaseType)}
{`${showStatus ? ':' : ''}`}
</span>
{showStatus && (
<span className={styles.connectionItemValue}>
<KubernetesOperatorStatus
operator={operator}
databaseType={databaseType}
kubernetes={kubernetes}
setSelectedCluster={setSelectedCluster}
setOperatorToUpdate={setOperatorToUpdate}
setUpdateOperatorModalVisible={setUpdateOperatorModalVisible}
/>
</span>
)}
</div>
);
};