Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Match core wizard design #1044

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
2961e46
Bump prismjs from 1.25.0 to 1.27.0 in /dashboards-observability (#508…
opensearch-trigger-bot[bot] Mar 10, 2022
4afca56
change to support java 8 in compile and runtime (#575) (#576)
opensearch-trigger-bot[bot] Mar 11, 2022
c85b9ef
Add 1.3.0 release notes (#580) (#582)
opensearch-trigger-bot[bot] Mar 14, 2022
f1c410d
Merge branch '1.3' of github.com:opensearch-project/trace-analytics
mengweieric Mar 28, 2022
82db8c1
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Mar 29, 2022
ebcf5d4
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Mar 30, 2022
2dfd988
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Mar 31, 2022
9da1830
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Mar 31, 2022
41061dd
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 4, 2022
b3c27d8
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 6, 2022
ac027d9
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 6, 2022
a4e104b
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 6, 2022
988862b
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 10, 2022
941607a
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 12, 2022
ee3e67d
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 13, 2022
e5f34fd
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 13, 2022
92f959e
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 15, 2022
e429b94
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 18, 2022
e92691b
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 19, 2022
4e09ce5
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 19, 2022
70f3c04
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Apr 19, 2022
9c17d6b
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric May 11, 2022
c6daa2c
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric May 11, 2022
8fa87ed
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric May 15, 2022
b54de85
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric May 17, 2022
6034004
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Jun 24, 2022
9642f8c
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Jul 26, 2022
4e46b74
query manager
mengweieric Jul 26, 2022
ba0435b
removed aggregations from dimensions
mengweieric Jul 27, 2022
78bef4b
qm improvements
mengweieric Aug 3, 2022
6712046
types/code cleanups/error corrections
mengweieric Aug 3, 2022
33000c2
Merge branch 'main' of github.com:opensearch-project/trace-analytics
mengweieric Aug 3, 2022
b01b063
Merge branch 'main' into antlr-ppl
mengweieric Aug 3, 2022
ae0598c
qm fixes for query builder
mengweieric Aug 9, 2022
e819703
viz timestamp selector
mengweieric Aug 15, 2022
36c6b5a
query manager integration with bar step 1
mengweieric Aug 15, 2022
0b47d86
span fix
mengweieric Aug 26, 2022
d91ba63
use postinstall for antlr output files
mengweieric Sep 1, 2022
4f327ab
resolved conflicts and integrate diverged changes
mengweieric Sep 2, 2022
55163d0
query building fix
mengweieric Sep 2, 2022
717262e
updated snapshots
mengweieric Sep 3, 2022
ea37046
fixed file not found issue
mengweieric Sep 7, 2022
4a0a1f3
remove output files
mengweieric Sep 7, 2022
92ddf3e
merged main and resolved conflicts
mengweieric Sep 7, 2022
1de2012
removed extra padding
mengweieric Sep 8, 2022
7220802
changed field button size to m
mengweieric Sep 8, 2022
d18b44f
adjusted styling to align with wizard ux design
mengweieric Sep 9, 2022
fb4b81e
added according for field sections
mengweieric Sep 12, 2022
0825b33
remove reset
mengweieric Sep 13, 2022
4c0684e
add scrolling and followed core team's design
mengweieric Sep 16, 2022
64b2d72
field selector title
mengweieric Sep 16, 2022
6123f1b
synced with main
mengweieric Sep 23, 2022
697dd25
field selector fix, viz selector restyling
mengweieric Sep 26, 2022
764a718
path issue
mengweieric Sep 26, 2022
0c3b35b
merged main and resloved conflicts
mengweieric Sep 26, 2022
5a46f8a
event sidebar, one renaming
mengweieric Sep 26, 2022
210918a
run tests and update snapshots
mengweieric Sep 26, 2022
c1097a4
code clean up
mengweieric Sep 27, 2022
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
8 changes: 4 additions & 4 deletions dashboards-observability/common/types/explorer.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ export interface ILogExplorerProps {
) => void;
savedObjectId: string;
getExistingEmptyTab: (params: EmptyTabParams) => string;
qm: QueryManager;
queryManager: QueryManager;
}

export interface IExplorerProps {
Expand Down Expand Up @@ -130,7 +130,7 @@ export interface IExplorerProps {
appBaseQuery?: string;
callback?: any;
callbackInApp?: any;
qm: QueryManager;
queryManager: QueryManager;
}

export interface SavedQuery {
Expand Down Expand Up @@ -316,13 +316,13 @@ export interface EventAnalyticsProps {
timestampUtils: TimestampUtils;
http: HttpStart;
notifications: NotificationsStart;
qm: QueryManager;
queryManager: QueryManager;
}

export interface DataConfigPanelProps {
fieldOptionList: IField[];
visualizations: IVisualizationContainerProps;
qm?: QueryManager;
queryManager?: QueryManager;
}
export interface GetTooltipHoverInfoType {
tooltipMode: string;
Expand Down
6 changes: 3 additions & 3 deletions dashboards-observability/public/components/app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ interface ObservabilityAppDeps {
dslService: any;
savedObjects: any;
timestampUtils: any;
qm: QueryManager;
queryManager: QueryManager;
}

// for cypress to test redux store
Expand All @@ -40,7 +40,7 @@ export const App = ({
dslService,
savedObjects,
timestampUtils,
qm,
queryManager,
}: ObservabilityAppDeps) => {
const { chrome, http, notifications } = CoreStartProp;
const parentBreadcrumb = {
Expand Down Expand Up @@ -133,7 +133,7 @@ export const App = ({
timestampUtils={timestampUtils}
http={http}
notifications={notifications}
qm={qm}
queryManager={queryManager}
{...props}
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -78,3 +78,45 @@
margin-right: $euiSizeXS;
}
}

.shard__fieldSelectorField {
&:hover,
&:focus-within,
&[class*='-isActive'] {
.dscSidebarItem__action {
opacity: 1;
}
}

& > .osdFieldButton__button {
padding: 0;
}

& .osdFieldButton__name {
padding: $euiSizeS $euiSizeS $euiSizeS 0;
}

& > button {
align-items: stretch;
}

& .osdFieldIcon {
box-shadow: none;
height: 100%;
flex-shrink: 0;
line-height: 0;
}

& .osdFieldButton__fieldIcon {
box-shadow: none;
margin-right: 8px;
}
}

#vis__mainContent .explorer__fieldSelectorField {
@include euiBottomShadowSmall;

background-color: $euiColorEmptyShade;
border: $euiBorderThin;
margin-top: $euiSizeS;
}
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ export function FieldButton({
buttonProps,
...rest
}: FieldButtonProps) {

const classes = classNames(
'osdFieldButton',
size ? sizeToClassNameMap[size] : null,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ export interface FieldIconProps extends Omit<EuiTokenProps, 'iconType'> {
}

// defaultIcon => a unknown datatype
const defaultIcon = { iconType: 'questionInCircle', color: 'gray' };
const defaultIcon = { iconType: 'tokenString' };

export const typeToEuiIconMap: Partial<Record<string, EuiTokenProps>> = {
boolean: { iconType: 'tokenBoolean' },
Expand All @@ -50,13 +50,12 @@ export const typeToEuiIconMap: Partial<Record<string, EuiTokenProps>> = {
export function FieldIcon({
type,
label,
size = 's',
size = 'l',
scripted,
className,
...rest
}: FieldIconProps) {
const token = typeToEuiIconMap[type] || defaultIcon;

return (
<EuiToken
{...token}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,22 @@
* SPDX-License-Identifier: Apache-2.0
*/

.liveStream {
margin : 8px;
height: 40px;
align-items: center;
justify-content: center;
flex-direction: row;
display: flex;
flex-grow: 1;
vertical-align: baseline;
}
#opensearch-dashboards-body {
overflow-y: hidden;
}

.liveStream {
margin : 8px;
height: 40px;
align-items: center;
justify-content: center;
flex-direction: row;
display: flex;
flex-grow: 1;
vertical-align: baseline;
}

.mainContentTabs .euiResizableContainer {
height: calc(100vh - 298px);
}

Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ export const Explorer = ({
setEndTime,
callback,
callbackInApp,
qm,
queryManager,
}: IExplorerProps) => {
const dispatch = useDispatch();
const requestParams = { tabId };
Expand Down Expand Up @@ -497,6 +497,7 @@ export const Explorer = ({
handleQuerySearch(availability);
};


/**
* Toggle fields between selected and unselected sets
* @param field field to be toggled
Expand Down Expand Up @@ -585,7 +586,7 @@ export const Explorer = ({
data-test-subj="eventExplorer__sidebar"
>
{!isSidebarClosed && (
<div className="dscFieldChooser">
<div className="explorerFieldSelector">
<Sidebar
query={query}
explorerFields={explorerFields}
Expand Down Expand Up @@ -768,7 +769,7 @@ export const Explorer = ({
handleOverrideTimestamp={handleOverrideTimestamp}
callback={callbackForConfig}
changeIsValidConfigOptionState={changeIsValidConfigOptionState}
qm={qm}
queryManager={queryManager}
/>
);
};
Expand Down Expand Up @@ -925,8 +926,7 @@ export const Explorer = ({

if (selectedContentTabId === TAB_CHART_ID) {
// parse stats section on every search
const qm = new QueryManager();
const statsTokens = qm.queryParser().parse(tempQuery).getStats();
const statsTokens = queryManager.queryParser().parse(tempQuery).getStats();

const updatedDataConfig = getUpdatedDataConfig(statsTokens);
await dispatch(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@
}
}

// #queryTabs {
// height: calc(100vh - 98px);
// }

.tab-title {
display: inline-block;
margin-right: 5px;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ export const LogExplorer = ({
history,
notifications,
http,
qm,
queryManager,
}: ILogExplorerProps) => {
const dispatch = useDispatch();
const tabIds = useSelector(selectQueryTabs).queryTabIds.filter(
Expand Down Expand Up @@ -185,7 +185,7 @@ export const LogExplorer = ({
curSelectedTabId={curSelectedTabIdRef}
http={http}
searchBarConfigs={searchBarConfigs}
qm={qm}
queryManager={queryManager}
/>
</>
),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ exports[`Field component Renders a sidebar field 1`] = `
anchorPosition="rightUp"
button={
<FieldButton
className="dscSidebarItem"
className="shard__fieldSelectorField explorer__fieldSelectorField"
dataTestSubj="field-agent-showDetails"
fieldAction={
<React.Fragment>
Expand Down Expand Up @@ -67,7 +67,7 @@ exports[`Field component Renders a sidebar field 1`] = `
}
isActive={false}
onClick={[Function]}
size="s"
size="m"
/>
}
closePopover={[Function]}
Expand All @@ -85,7 +85,7 @@ exports[`Field component Renders a sidebar field 1`] = `
className="euiPopover__anchor"
>
<FieldButton
className="dscSidebarItem"
className="shard__fieldSelectorField explorer__fieldSelectorField"
dataTestSubj="field-agent-showDetails"
fieldAction={
<React.Fragment>
Expand Down Expand Up @@ -131,10 +131,10 @@ exports[`Field component Renders a sidebar field 1`] = `
}
isActive={false}
onClick={[Function]}
size="s"
size="m"
>
<div
className="osdFieldButton osdFieldButton--small dscSidebarItem"
className="osdFieldButton shard__fieldSelectorField explorer__fieldSelectorField"
>
<button
className="osd-resetFocusState osdFieldButton__button"
Expand All @@ -151,23 +151,23 @@ exports[`Field component Renders a sidebar field 1`] = `
aria-label="string"
className="osdFieldIcon"
iconType="tokenString"
size="s"
size="l"
title="string"
>
<span
className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--small osdFieldIcon"
className="euiToken euiToken--euiColorVis1 euiToken--square euiToken--light euiToken--large osdFieldIcon"
style={Object {}}
>
<EuiIcon
aria-label="string"
size="m"
size="l"
title="string"
type="tokenString"
>
<EuiIconEmpty
aria-hidden={true}
aria-label="string"
className="euiIcon euiIcon--medium euiIcon-isLoading"
className="euiIcon euiIcon--large euiIcon-isLoading"
focusable="false"
role="img"
style={null}
Expand All @@ -176,7 +176,7 @@ exports[`Field component Renders a sidebar field 1`] = `
<svg
aria-hidden={true}
aria-label="string"
className="euiIcon euiIcon--medium euiIcon-isLoading"
className="euiIcon euiIcon--large euiIcon-isLoading"
focusable="false"
height={16}
role="img"
Expand Down
Loading