Skip to content

Commit

Permalink
[Security Solution][Alert Details] - fix some UI issues related to em…
Browse files Browse the repository at this point in the history
…otion/css vs emotion/react (#205664)

## Summary

This recent [PR](#205011) slightly
broke the UI in a couple of small places in the alert details flyout.
Strangely, I did review the PR by pulling down the branch, but only
looked at the places that were impacted by the files modified. The
couple of places where the UI broke were completely different...
My guess it is is related to the fact that in those place we were still
using `@emotion/css` and this might not play nice with some
`styled_components`...

Updating those places to use `@emotion/react` fixed the issues!

| Before fix  | After fix |
| ------------- | ------------- |
|
![broken-1](https://github.com/user-attachments/assets/839760db-da3c-4031-b4be-18645b37c089)
|
![fix-1](https://github.com/user-attachments/assets/cdfae85c-0e63-45be-94dd-5e0f9a698d8a)
|

| Before fix  | After fix |
| ------------- | ------------- |
|
![broken-2](https://github.com/user-attachments/assets/22588529-5afd-491d-ab00-6e07593fb6f7)
|
![fix-2](https://github.com/user-attachments/assets/c078d814-1a33-49dc-aa0d-25dcff555de2)
|

| Before fix  | After fix |
| ------------- | ------------- |
|
![broken-3](https://github.com/user-attachments/assets/082d306c-8866-4e4f-ab18-db7c649101fe)
|
![fix-3](https://github.com/user-attachments/assets/5da76c44-934b-4a2a-a98e-2de34973d02e)
|

In a follow work, we need to remove completely all the
`styled_components` we have.
  • Loading branch information
PhilippeOberti authored Jan 8, 2025
1 parent 3fd987c commit a8e1bf4
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
useEuiFontSize,
EuiSkeletonText,
} from '@elastic/eui';
import { css } from '@emotion/css';
import { css } from '@emotion/react';
import { getOr } from 'lodash/fp';
import { i18n } from '@kbn/i18n';
import { HOST_NAME_FIELD_NAME } from '../../../../timelines/components/timeline/body/renderers/constants';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import {
useEuiFontSize,
EuiSkeletonText,
} from '@elastic/eui';
import { css } from '@emotion/css';
import { css } from '@emotion/react';
import { getOr } from 'lodash/fp';
import { i18n } from '@kbn/i18n';
import { useDocumentDetailsContext } from '../../shared/context';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
*/

import React, { useMemo } from 'react';
import { css } from '@emotion/css';
import { css } from '@emotion/react';
import {
EuiFlexGroup,
EuiFlexItem,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React, { useEffect, useMemo } from 'react';
import { EuiFlexItem, type EuiFlexGroupProps, useEuiTheme } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import { css } from '@emotion/css';
import { css } from '@emotion/react';
import { useMisconfigurationPreview } from '@kbn/cloud-security-posture/src/hooks/use_misconfiguration_preview';
import { buildGenericEntityFlyoutPreviewQuery } from '@kbn/cloud-security-posture-common';
import {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import React, { useEffect, useMemo } from 'react';
import { EuiFlexItem, type EuiFlexGroupProps, useEuiTheme } from '@elastic/eui';
import { FormattedMessage } from '@kbn/i18n-react';
import { css } from '@emotion/css';
import { css } from '@emotion/react';
import { useVulnerabilitiesPreview } from '@kbn/cloud-security-posture/src/hooks/use_vulnerabilities_preview';
import { buildGenericEntityFlyoutPreviewQuery } from '@kbn/cloud-security-posture-common';
import { getVulnerabilityStats, hasVulnerabilitiesData } from '@kbn/cloud-security-posture';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import {
useEuiTheme,
EuiToolTip,
EuiSkeletonText,
useEuiFontSize,
} from '@elastic/eui';
import { i18n } from '@kbn/i18n';
import type { EuiPanelProps, IconType } from '@elastic/eui';
Expand Down Expand Up @@ -126,6 +127,7 @@ export const ExpandablePanel: FC<PropsWithChildren<ExpandablePanelPanelProps>> =
);

const { euiTheme } = useEuiTheme();
const xsFontSize = useEuiFontSize('xs').fontSize;

const headerLeftSection = useMemo(
() => (
Expand Down Expand Up @@ -159,8 +161,8 @@ export const ExpandablePanel: FC<PropsWithChildren<ExpandablePanelPanelProps>> =
<EuiToolTip content={link?.tooltip}>
<EuiLink
css={css`
font-size: 12px;
font-weight: 700;
font-size: ${xsFontSize};
font-weight: ${euiTheme.font.weight.bold};
`}
data-test-subj={`${dataTestSubj}TitleLink`}
onClick={link?.callback}
Expand All @@ -178,15 +180,17 @@ export const ExpandablePanel: FC<PropsWithChildren<ExpandablePanelPanelProps>> =
</EuiFlexItem>
),
[
euiTheme.size.xl,
euiTheme.size.s,
euiTheme.font.weight.bold,
dataTestSubj,
expandable,
children,
toggleIcon,
link?.callback,
iconType,
euiTheme.size.s,
euiTheme.size.xl,
link?.callback,
link?.tooltip,
xsFontSize,
title,
]
);
Expand Down

0 comments on commit a8e1bf4

Please sign in to comment.