Skip to content

Commit

Permalink
[Bug fix] Traces/Services bugfixes and UI update (#2229) (#2235)
Browse files Browse the repository at this point in the history 
* Bugfixes and ui update



* address comments



---------



(cherry picked from commit 39bb832)

Signed-off-by: Adam Tackett <[email protected]>
Signed-off-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com>
Co-authored-by: Adam Tackett <[email protected]>
  • Loading branch information
@opensearch-trigger-bot @github-actions
3 people authored Oct 29, 2024
1 parent 8fd4ee4 commit e627394
Show file tree
Hide file tree
Showing 8 changed files with 784 additions and 958 deletions.
145 changes: 97 additions & 48 deletions ...onents/trace_analytics/components/common/__tests__/__snapshots__/search_bar.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,7 +422,10 @@ exports[`Search bar components renders search bar 1`] = `
placeholder="Trace ID, trace group name, service name"
prepend={
<GlobalFilterButton
attributesFilterFields={Array []}
filters={Array []}
mode="data_prepper"
page="dashboard"
setFilters={[MockFunction]}
/>
}
Expand All @@ -435,7 +438,10 @@ exports[`Search bar components renders search bar 1`] = `
isLoading={false}
prepend={
<GlobalFilterButton
attributesFilterFields={Array []}
filters={Array []}
mode="data_prepper"
page="dashboard"
setFilters={[MockFunction]}
/>
}
Expand All @@ -444,20 +450,26 @@ exports[`Search bar components renders search bar 1`] = `
className="euiFormControlLayout euiFormControlLayout--fullWidth euiFormControlLayout--compressed euiFormControlLayout--group"
>
<GlobalFilterButton
attributesFilterFields={Array []}
className="euiFormControlLayout__prepend"
filters={Array []}
key="0/.0"
mode="data_prepper"
page="dashboard"
setFilters={[MockFunction]}
>
<EuiPopover
anchorPosition="rightUp"
anchorPosition="downLeft"
button={
<EuiSmallButtonIcon
aria-label="Change all filters"
<EuiButtonEmpty
iconType="filter"
onClick={[Function]}
title="Change all filters"
/>
size="s"
>
<EuiIcon
type="arrowDown"
/>
</EuiButtonEmpty>
}
closePopover={[Function]}
data-test-subj="global-filter-button"
Expand All @@ -468,67 +480,104 @@ exports[`Search bar components renders search bar 1`] = `
panelPaddingSize="none"
>
<div
className="euiPopover euiPopover--anchorRightUp"
className="euiPopover euiPopover--anchorDownLeft"
data-test-subj="global-filter-button"
>
<div
className="euiPopover__anchor"
>
<EuiSmallButtonIcon
aria-label="Change all filters"
<EuiButtonEmpty
iconType="filter"
onClick={[Function]}
title="Change all filters"
size="s"
>
<EuiButtonIcon
aria-label="Change all filters"
iconType="filter"
<button
className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--small"
disabled={false}
onClick={[Function]}
size="s"
title="Change all filters"
type="button"
>
<button
aria-label="Change all filters"
className="euiButtonIcon euiButtonIcon--primary euiButtonIcon--empty euiButtonIcon--small"
disabled={false}
onClick={[Function]}
title="Change all filters"
type="button"
<EuiButtonContent
className="euiButtonEmpty__content"
iconGap="m"
iconSide="left"
iconSize="m"
iconType="filter"
textProps={
Object {
"className": "euiButtonEmpty__text",
}
}
>
<EuiIcon
aria-hidden="true"
className="euiButtonIcon__icon"
color="inherit"
size="m"
type="filter"
<span
className="euiButtonContent euiButtonEmpty__content"
>
<EuiIconBeaker
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
focusable="false"
role="img"
style={null}
<EuiIcon
className="euiButtonContent__icon"
color="inherit"
size="m"
type="filter"
>
<svg
<EuiIconBeaker
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonIcon__icon"
className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
focusable="false"
height={16}
role="img"
style={null}
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
</svg>
</EuiIconBeaker>
</EuiIcon>
</button>
</EuiButtonIcon>
</EuiSmallButtonIcon>
<svg
aria-hidden={true}
className="euiIcon euiIcon--medium euiIcon--inherit euiIcon-isLoading euiButtonContent__icon"
focusable="false"
height={16}
role="img"
style={null}
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M5.277 10.088c.02.014.04.03.057.047.582.55 1.134.812 1.666.812.586 0 1.84-.293 3.713-.88L9 6.212V2H7v4.212l-1.723 3.876Zm-.438.987L3.539 14h8.922l-1.32-2.969C9.096 11.677 7.733 12 7 12c-.74 0-1.463-.315-2.161-.925ZM6 2H5V1h6v1h-1v4l3.375 7.594A1 1 0 0 1 12.461 15H3.54a1 1 0 0 1-.914-1.406L6 6V2Z"
/>
</svg>
</EuiIconBeaker>
</EuiIcon>
<span
className="euiButtonEmpty__text"
>
<EuiIcon
type="arrowDown"
>
<EuiIconArrowDown
aria-hidden={true}
className="euiIcon euiIcon--medium"
focusable="false"
role="img"
style={null}
>
<svg
aria-hidden={true}
className="euiIcon euiIcon--medium"
focusable="false"
height={16}
role="img"
style={null}
viewBox="0 0 16 16"
width={16}
xmlns="http://www.w3.org/2000/svg"
>
<path
d="M13.069 5.157 8.384 9.768a.546.546 0 0 1-.768 0L2.93 5.158a.552.552 0 0 0-.771 0 .53.53 0 0 0 0 .759l4.684 4.61c.641.631 1.672.63 2.312 0l4.684-4.61a.53.53 0 0 0 0-.76.552.552 0 0 0-.771 0Z"
fillRule="non-zero"
/>
</svg>
</EuiIconArrowDown>
</EuiIcon>
</span>
</span>
</EuiButtonContent>
</button>
</EuiButtonEmpty>
</div>
</div>
</EuiPopover>
Expand Down
86 changes: 1 addition & 85 deletions ...s/trace_analytics/components/common/filters/__tests__/__snapshots__/filters.test.tsx.snap
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,89 +6,5 @@ exports[`Filter component renders filters 1`] = `
filters={Array []}
page="dashboard"
setFilters={[MockFunction]}
>
<EuiFlexGroup
alignItems="center"
gutterSize="xs"
responsive={false}
>
<div
className="euiFlexGroup euiFlexGroup--gutterExtraSmall euiFlexGroup--alignItemsCenter euiFlexGroup--directionRow"
>
<EuiFlexItem
grow={false}
>
<div
className="euiFlexItem euiFlexItem--flexGrowZero"
>
<AddFilterButton>
<EuiPopover
anchorPosition="downLeft"
button={
<EuiButtonEmpty
flush="left"
onClick={[Function]}
size="xs"
>
+ Add filter
</EuiButtonEmpty>
}
closePopover={[Function]}
data-test-subj="addfilter"
display="inlineBlock"
hasArrow={true}
isOpen={false}
ownFocus={true}
panelPaddingSize="m"
>
<div
className="euiPopover euiPopover--anchorDownLeft"
data-test-subj="addfilter"
>
<div
className="euiPopover__anchor"
>
<EuiButtonEmpty
flush="left"
onClick={[Function]}
size="xs"
>
<button
className="euiButtonEmpty euiButtonEmpty--primary euiButtonEmpty--xSmall euiButtonEmpty--flushLeft"
disabled={false}
onClick={[Function]}
type="button"
>
<EuiButtonContent
className="euiButtonEmpty__content"
iconGap="m"
iconSide="left"
iconSize="s"
textProps={
Object {
"className": "euiButtonEmpty__text",
}
}
>
<span
className="euiButtonContent euiButtonEmpty__content"
>
<span
className="euiButtonEmpty__text"
>
+ Add filter
</span>
</span>
</EuiButtonContent>
</button>
</EuiButtonEmpty>
</div>
</div>
</EuiPopover>
</AddFilterButton>
</div>
</EuiFlexItem>
</div>
</EuiFlexGroup>
</Filters>
/>
`;
Loading

0 comments on commit e627394

Please sign in to comment.