Skip to content
Merged
Show file tree
Hide file tree
Changes from 3 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 src/components/Graphs/CustomNode.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ const CustomNode: React.FC<CustomNodeProps> = ({ label, type, status, transition
positiveText={t('common.healthy')}
negativeText={t('errors.notHealthy')}
message={statusMessage}
hideOnHoverEffect={true}
/>
</div>
<div className={styles.nodeTextContainer}>
Expand Down
2 changes: 1 addition & 1 deletion src/components/Graphs/graphUtils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export const resolveProviderType = (configName: string, providerConfigsList: Pro
};

export const generateColorMap = (items: NodeData[], colorBy: string): Record<string, string> => {
const colors = ['#E09D00', '#E6600D', '#AB218E', '#678BC7', '#1A9898', '#759421', '#925ACE', '#647987'];
const colors = ['#E09D00', '#e269c9', '#AB218E', '#678BC7', '#1A9898', '#759421', '#925ACE', '#647987'];

const keys = (() => {
if (colorBy === 'source') return Array.from(new Set(items.map((i) => i.providerType).filter(Boolean)));
Expand Down
35 changes: 25 additions & 10 deletions src/components/Shared/ResourceStatusCell.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { ButtonDomRef, FlexBox, Icon, ResponsivePopover, Text } from '@ui5/webcomponents-react';
import { Button, ButtonDomRef, FlexBox, Icon, ResponsivePopover, Text } from '@ui5/webcomponents-react';
import { formatDateAsTimeAgo } from '../../utils/i18n/timeAgo';
import { useRef, useState } from 'react';
import { AnimatedHoverTextButton } from '../Helper/AnimatedHoverTextButton.tsx';
Expand All @@ -10,16 +10,19 @@ export interface ResourceStatusCellProps {
message?: string;
positiveText: string;
negativeText: string;
hideOnHoverEffect?: boolean;
}
export const ResourceStatusCell = ({
isOk,
transitionTime,
message,
positiveText,
negativeText,
hideOnHoverEffect,
}: ResourceStatusCellProps) => {
const btnRef = useRef<ButtonDomRef>(null);
const [popoverIsOpen, setPopoverIsOpen] = useState(false);
const timeAgo = transitionTime ? formatDateAsTimeAgo(transitionTime) : '-';

const handleClose = () => {
setPopoverIsOpen(false);
Expand All @@ -29,19 +32,31 @@ export const ResourceStatusCell = ({
};
return (
<span>
<AnimatedHoverTextButton
ref={btnRef}
icon={
{hideOnHoverEffect ? (
<Button ref={btnRef} design="Transparent" title={timeAgo} aria-label={timeAgo} onClick={handleOpen}>
<Icon
design={isOk ? 'Positive' : 'Negative'}
name={isOk ? 'sys-enter-2' : 'sys-cancel-2'}
showTooltip={true}
accessibleName={transitionTime ? formatDateAsTimeAgo(transitionTime) : '-'}
accessibleName={timeAgo}
/>
}
text={isOk ? positiveText : negativeText}
onClick={handleOpen}
/>
</Button>
) : (
<AnimatedHoverTextButton
ref={btnRef}
icon={
<Icon
design={isOk ? 'Positive' : 'Negative'}
name={isOk ? 'sys-enter-2' : 'sys-cancel-2'}
showTooltip={true}
accessibleName={timeAgo}
/>
}
text={isOk ? positiveText : negativeText}
onClick={handleOpen}
/>
)}

<ResponsivePopover
opener={btnRef.current ?? undefined}
open={popoverIsOpen}
Expand All @@ -64,7 +79,7 @@ export const ResourceStatusCell = ({
color: isOk ? 'var(--sapPositiveTextColor)' : 'var(--sapNegativeTextColor)',
}}
>
{formatDateAsTimeAgo(transitionTime)}
{timeAgo}
</Text>
</FlexBox>
</ResponsivePopover>
Expand Down
Loading