Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
ff00a73
🛠️ Migrate `components/_app.scss` file
mariairiartef Mar 3, 2025
48e168f
Delete import
mariairiartef Mar 3, 2025
7bf419d
Migrate grapgh container styles
mariairiartef Mar 3, 2025
ec99e04
Remove unused margin from graph menus in `_graph.scss`
mariairiartef Mar 3, 2025
961de88
Remove unused flex group styles from `_graph.scss`
mariairiartef Mar 3, 2025
d70d05a
Remove unused `_graph.scss` file and update imports in `_index.scss`
mariairiartef Mar 3, 2025
bb044da
Remove unused import in workspace_layout.tsx
mariairiartef Mar 3, 2025
f9826d2
Remove unused `inspect.scss` file and update imports in _index.scss
mariairiartef Mar 3, 2025
8683423
Migrate grapgh search bar data source button styles
mariairiartef Mar 3, 2025
7428a92
Remove unused `_field_editor.scss` and update imports in `_index.scss…
mariairiartef Mar 4, 2025
393c855
Remove unused `_field_picker.scss` and `_index.scss`; refactor `Field…
mariairiartef Mar 4, 2025
ba0f637
Remove unused `_mixins.scss` and update imports in `_index.scss` and …
mariairiartef Mar 4, 2025
86a93de
Refactor sidebar styles to use Emotion for styling and remove unused CSS
mariairiartef Mar 4, 2025
a461ff3
Refactor sidebar components to use Emotion for styling and remove unu…
mariairiartef Mar 4, 2025
c266268
Refactor ControlPanel and SelectedNodeItem to use Emotion for styling…
mariairiartef Mar 4, 2025
bab25c0
Refactor components to remove sidebar styles and implement Emotion fo…
mariairiartef Mar 5, 2025
8e0ca4a
Fix imports
mariairiartef Mar 6, 2025
af032ac
Refactor styles to remove SCSS files and implement Emotion for stylin…
mariairiartef Mar 7, 2025
727b3cf
Refactor FieldEditor and FieldPicker to use Emotion for styling; rena…
mariairiartef Mar 7, 2025
02490a1
Merge branch 'main' into lens/scss-js/graph
mariairiartef Mar 11, 2025
c7033f2
Refactor
mariairiartef Mar 11, 2025
d7ed1cd
Delete gphNoUserSelect class
mariairiartef Mar 11, 2025
8f5a686
Refactor GraphVisualization component styles for improved readability
mariairiartef Mar 11, 2025
1cc4c48
Refactor GraphVisualization and SelectedNodeItem components for impro…
mariairiartef Mar 11, 2025
873e685
Remove unused classNames import and clean up edge wrapper in GraphVis…
mariairiartef Mar 11, 2025
e71cd17
Refactor
mariairiartef Mar 11, 2025
95eda21
Refactor SelectionToolBar component to remove unused styles and simpl…
mariairiartef Mar 12, 2025
7df8451
Merge branch 'main' into lens/scss-js/graph
mariairiartef Mar 12, 2025
6fcb863
Refactor
mariairiartef Mar 12, 2025
1168703
Add class names used in functional tests
mariairiartef Mar 13, 2025
3395c65
Add style prop because is used in functional test
mariairiartef Mar 13, 2025
3953bcf
Merge branch 'main' into lens/scss-js/graph
mariairiartef Mar 14, 2025
6f51228
[Graph] Update strokeWidth styles in snapshot tests
mariairiartef Mar 17, 2025
fe638ae
Merge branch 'main' into lens/scss-js/graph
mariairiartef Mar 17, 2025
9bf71f9
Merge branch 'main' into lens/scss-js/graph
mariairiartef Mar 17, 2025
2554224
Merge branch 'main' into lens/scss-js/graph
mariairiartef Mar 18, 2025
c3efd6b
Merge branch 'main' into lens/scss-js/graph
mariairiartef Mar 19, 2025
fc8cccb
Add UseEuiTheme Type-Only Import and remove unused .kuiIcon styles
mariairiartef Mar 19, 2025
acd1340
Merge branch 'main' into lens/scss-js/graph
mariairiartef Mar 19, 2025
6e5cbf0
Merge branch 'main' into lens/scss-js/graph
mariairiartef Mar 19, 2025
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
6 changes: 0 additions & 6 deletions x-pack/platform/plugins/private/graph/public/_main.scss
Original file line number Diff line number Diff line change
Expand Up @@ -20,12 +20,6 @@
* Utilities
*/

.gphNoUserSelect {
user-select: none;
-webkit-touch-callout: none;
-webkit-tap-highlight-color: transparent;
}

Comment thread
mariairiartef marked this conversation as resolved.
.gphAppWrapper {
display: flex;
flex-direction: column;
Expand Down
5 changes: 0 additions & 5 deletions x-pack/platform/plugins/private/graph/public/_mixins.scss

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,9 +1,2 @@
@import './app';
@import './search_bar';
@import './source_modal';
@import './graph_visualization/index';
@import './settings/index';
@import './field_manager/index';
@import './graph';
@import './sidebar';
@import './inspect';

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import React from 'react';
import { i18n } from '@kbn/i18n';
import { connect } from 'react-redux';
import { type UseEuiTheme, useEuiShadow, euiFontSize } from '@elastic/eui';
import { css } from '@emotion/react';
import {
ControlType,
TermIntersect,
Expand All @@ -26,6 +28,7 @@ import { DrillDowns } from './drill_downs';
import { DrillDownIconLinks } from './drill_down_icon_links';
import { GraphState, liveResponseFieldsSelector, templatesSelector } from '../../state_management';
import { SelectedNodeItem } from './selected_node_item';
import { gphSidebarHeaderStyles } from '../../styles';

export interface TargetOptions {
toFields: WorkspaceField[];
Expand Down Expand Up @@ -78,21 +81,29 @@ const ControlPanelComponent = ({
};

return (
<div id="sidebar" className="gphSidebar">
<div
id="sidebar"
css={[
css`
${useEuiShadow('m')};
`,
styles.gphSidebar,
]}
>
<ControlPanelToolBar
workspace={workspace}
liveResponseFields={liveResponseFields}
onSetControl={onSetControl}
/>

<div>
<div className="gphSidebar__header">
<div css={gphSidebarHeaderStyles}>
{i18n.translate('xpack.graph.sidebar.selectionsTitle', {
defaultMessage: 'Selections',
})}
</div>
<SelectionToolBar workspace={workspace} onSetControl={onSetControl} />
<div className="gphSelectionList">
<div css={styles.gphSelectionList}>
{workspace.selectedNodes.length === 0 && (
<p className="help-block">
{i18n.translate('xpack.graph.sidebar.selections.noSelectionsHelpText', {
Expand Down Expand Up @@ -137,6 +148,35 @@ const ControlPanelComponent = ({
);
};

const styles = {
gphSidebar: (euiThemeContext: UseEuiTheme) =>
css({
position: 'absolute',
right: euiThemeContext.euiTheme.size.s,
top: euiThemeContext.euiTheme.size.s,
width: `calc(${euiThemeContext.euiTheme.size.xl} * 10)`,
zIndex: euiThemeContext.euiTheme.levels.flyout, // https://eui.elastic.co/#/theming/more-tokens#levels
backgroundColor: euiThemeContext.euiTheme.colors.emptyShade,
border: euiThemeContext.euiTheme.border.thin,
padding: euiThemeContext.euiTheme.size.xs,
borderRadius: euiThemeContext.euiTheme.border.radius.medium,
opacity: 0.9,

'.help-block': {
fontSize: euiFontSize(euiThemeContext, 'xs', { unit: 'px' }).fontSize,
color: euiThemeContext.euiTheme.colors.text,
},
}),

gphSelectionList: ({ euiTheme }: UseEuiTheme) =>
css({
height: `calc(${euiTheme.size.l} * 10)`,
backgroundColor: euiTheme.colors.lightestShade,
overflow: 'auto',
marginBottom: 0,
}),
};

export const ControlPanel = connect((state: GraphState) => ({
urlTemplates: templatesSelector(state),
liveResponseFields: liveResponseFieldsSelector(state),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,15 @@
* 2.0.
*/

import { EuiButtonIcon, EuiFlexGroup, EuiFlexItem, EuiToolTip } from '@elastic/eui';
import {
EuiButtonIcon,
EuiFlexGroup,
EuiFlexItem,
EuiToolTip,
type UseEuiTheme,
} from '@elastic/eui';
import React from 'react';
import { css } from '@emotion/react';
import { UrlTemplate } from '../../types';
import { IconRenderer } from '../icon_renderer';

Expand Down Expand Up @@ -48,11 +55,16 @@ export const DrillDownIconLinks = ({

return (
<EuiFlexGroup
className="gphDrillDownIconLinks"
justifyContent="flexStart"
alignItems="center"
gutterSize="xs"
responsive={false}
css={({ euiTheme }: UseEuiTheme) =>
css({
marginTop: `calc(0.5 * ${euiTheme.size.xs})`,
marginBottom: `calc(0.5 * ${euiTheme.size.xs})`,
})
}
>
{drillDowns}
</EuiFlexGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ import { i18n } from '@kbn/i18n';
import { EuiIcon } from '@elastic/eui';
import { UrlTemplate } from '../../types';
import { IconRenderer } from '../icon_renderer';
import { gphSidebarHeaderStyles, gphSidebarPanelStyles, noUserSelectStyles } from '../../styles';

interface DrillDownsProps {
urlTemplates: UrlTemplate[];
Expand All @@ -19,14 +20,14 @@ interface DrillDownsProps {
export const DrillDowns = ({ urlTemplates, openUrlTemplate }: DrillDownsProps) => {
return (
<div>
<div className="gphSidebar__header">
<div css={gphSidebarHeaderStyles}>
<EuiIcon type="iInCircle" />{' '}
{i18n.translate('xpack.graph.sidebar.drillDownsTitle', {
defaultMessage: 'Drill-downs',
})}
</div>

<div className="gphSidebar__panel">
<div css={gphSidebarPanelStyles}>
{urlTemplates.length === 0 && (
<p className="help-block">
{i18n.translate('xpack.graph.sidebar.drillDowns.noDrillDownsHelpText', {
Expand All @@ -43,7 +44,7 @@ export const DrillDowns = ({ urlTemplates, openUrlTemplate }: DrillDownsProps) =
<li className="list-group-item">
{urlTemplate.icon && (
<>
<IconRenderer icon={urlTemplate.icon} className="gphNoUserSelect" />{' '}
<IconRenderer icon={urlTemplate.icon} css={noUserSelectStyles} />{' '}
</>
)}
<a aria-hidden="true" onClick={onOpenUrlTemplate}>
Expand Down
Loading
Loading