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.

Sign up for GitHub

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

Jump to bottom

Move qm to plugins #1023 #1036

Merged
merged 5 commits into from
Sep 20, 2022
Merged

Move qm to plugins #1023 #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a9eb802
move qm: in progress
ramneet-persistent Sep 16, 2022
50f3a86
qm instances prop adedd + yarn test
ramneet-persistent Sep 16, 2022
facb48d
main rebase
ramneet-persistent Sep 19, 2022
d0603e7
explorereFields type fixed
ramneet-persistent Sep 19, 2022
248e73d
querymanager types added, renamed to qm
ramneet-persistent Sep 20, 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
43 changes: 41 additions & 2 deletions dashboards-observability/common/types/explorer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@

import { History } from 'history';
import Plotly from 'plotly.js-dist';
import { QueryManager } from 'common/query_manager';
import {
RAW_QUERY,
SELECTED_FIELDS,
Expand All @@ -16,12 +17,18 @@ import {
SELECTED_TIMESTAMP,
SELECTED_DATE_RANGE,
} from '../constants/explorer';
import { CoreStart, HttpSetup, HttpStart, NotificationsStart } from '../../../../src/core/public';
import {
CoreStart,
CoreSetup,
HttpSetup,
HttpStart,
NotificationsStart,
} from '../../../../src/core/public';
import SavedObjects from '../../public/services/saved_objects/event_analytics/saved_objects';
import TimestampUtils from '../../public/services/timestamp/timestamp';
import PPLService from '../../public/services/requests/ppl';
import DSLService from '../../public/services/requests/dsl';

import { SavedObjectsStart } from '../../../../src/core/public/saved_objects';
export interface IQueryTab {
id: string;
name: React.ReactNode | string;
Expand All @@ -34,6 +41,13 @@ export interface IField {
label?: string;
}

export interface ExplorerFields {
availableFields: IField[];
queriedFields: IField[];
selectedFields: IField[];
unselectedFields: IField[];
}

export interface ITabQueryResults {
[tabId: string]: any;
}
Expand Down Expand Up @@ -83,6 +97,7 @@ export interface ILogExplorerProps {
) => void;
savedObjectId: string;
getExistingEmptyTab: (params: EmptyTabParams) => string;
qm: QueryManager;
}

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

export interface SavedQuery {
Expand Down Expand Up @@ -283,3 +299,26 @@ export interface ConfigList {
breakdowns?: ConfigListEntry[] | HistogramConfigList[];
span?: DimensionSpan;
}

export interface Breadcrumbs {
text: string;
href: string;
}

export interface EventAnalyticsProps {
chrome: CoreSetup;
parentBreadcrumbs: Breadcrumbs[];
pplService: any;
dslService: any;
savedObjects: SavedObjectsStart;
timestampUtils: TimestampUtils;
http: HttpStart;
notifications: NotificationsStart;
qm: QueryManager;
}

export interface DataConfigPanelProps {
fieldOptionList: IField[];
visualizations: IVisualizationContainerProps;
qm?: QueryManager;
}
4 changes: 4 additions & 0 deletions dashboards-observability/public/components/app.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { I18nProvider } from '@osd/i18n/react';
import React from 'react';
import { Provider } from 'react-redux';
import { HashRouter, Route, Switch } from 'react-router-dom';
import { QueryManager } from 'common/query_manager';
import { CoreStart } from '../../../../src/core/public';
import { observabilityID, observabilityTitle } from '../../common/constants/shared';
import store from '../framework/redux/store';
Expand All @@ -24,6 +25,7 @@ interface ObservabilityAppDeps {
dslService: any;
savedObjects: any;
timestampUtils: any;
qm: QueryManager;
}

// for cypress to test redux store
Expand All @@ -38,6 +40,7 @@ export const App = ({
dslService,
savedObjects,
timestampUtils,
qm,
}: ObservabilityAppDeps) => {
const { chrome, http, notifications } = CoreStartProp;
const parentBreadcrumb = {
Expand Down Expand Up @@ -130,6 +133,7 @@ export const App = ({
timestampUtils={timestampUtils}
http={http}
notifications={notifications}
qm={qm}
{...props}
/>
);
Expand Down
44 changes: 22 additions & 22 deletions dashboards-observability/public/components/event_analytics/explorer/explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,6 @@ import { getVizContainerProps } from '../../visualizations/charts/helpers';
import { parseGetSuggestions, onItemSelect } from '../../common/search/autocomplete_logic';
import { formatError } from '../utils';
import { sleep } from '../../common/live_tail/live_tail_button';
import { QueryManager } from '../../../../common/query_manager/ppl_query_manager';

const TYPE_TAB_MAPPING = {
[SAVED_QUERY]: TAB_EVENT_ID,
Expand Down Expand Up @@ -107,6 +106,7 @@ export const Explorer = ({
setEndTime,
callback,
callbackInApp,
qm,
}: IExplorerProps) => {
const dispatch = useDispatch();
const requestParams = { tabId };
Expand Down Expand Up @@ -143,7 +143,7 @@ export const Explorer = ({
const [browserTabFocus, setBrowserTabFocus] = useState(true);
const [liveTimestamp, setLiveTimestamp] = useState(DATE_PICKER_FORMAT);
const [triggerAvailability, setTriggerAvailability] = useState(false);
const [isValidDataConfigOptionSelected, setIsValidDataConfigOptionSelected] = useState<Boolean>(
const [isValidDataConfigOptionSelected, setIsValidDataConfigOptionSelected] = useState<boolean>(
false
);

Expand Down Expand Up @@ -631,7 +631,7 @@ export const Explorer = ({
0
)}
showResetButton={false}
onResetQuery={() => { }}
onResetQuery={() => {}}
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>
Expand Down Expand Up @@ -672,7 +672,7 @@ export const Explorer = ({
<HitsCounter
hits={totalHits}
showResetButton={false}
onResetQuery={() => { }}
onResetQuery={() => {}}
/>
</EuiFlexItem>
<EuiFlexItem grow={false}>since {liveTimestamp}</EuiFlexItem>
Expand Down Expand Up @@ -746,7 +746,7 @@ export const Explorer = ({
}
};

const changeIsValidConfigOptionState = (isValidConfig: Boolean) =>
const changeIsValidConfigOptionState = (isValidConfig: boolean) =>
setIsValidDataConfigOptionSelected(isValidConfig);

const getExplorerVis = () => {
Expand All @@ -764,6 +764,7 @@ export const Explorer = ({
handleOverrideTimestamp={handleOverrideTimestamp}
callback={callbackForConfig}
changeIsValidConfigOptionState={changeIsValidConfigOptionState}
qm={qm}
/>
);
};
Expand Down Expand Up @@ -841,30 +842,29 @@ 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 timeUnitValue = TIME_INTERVAL_OPTIONS.find(
(time_unit) => time_unit.value === statsTokens.groupby?.span.span_expression.time_unit
)?.text;
const span =
statsTokens.groupby?.span !== null
? {
time_field: [
{
name: statsTokens.groupby?.span.span_expression.field,
type: 'timestamp',
label: statsTokens.groupby?.span.span_expression.field,
},
],
unit: [
{
text: timeUnitValue,
value: statsTokens.groupby?.span.span_expression.time_unit,
label: timeUnitValue,
},
],
interval: statsTokens.groupby?.span.span_expression.literal_value,
}
time_field: [
{
name: statsTokens.groupby?.span.span_expression.field,
type: 'timestamp',
label: statsTokens.groupby?.span.span_expression.field,
},
],
unit: [
{
text: timeUnitValue,
value: statsTokens.groupby?.span.span_expression.time_unit,
label: timeUnitValue,
},
],
interval: statsTokens.groupby?.span.span_expression.literal_value,
}
: undefined;

await dispatch(
Expand Down
2 changes: 2 additions & 0 deletions dashboards-observability/public/components/event_analytics/explorer/log_explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@ export const LogExplorer = ({
history,
notifications,
http,
qm,
}: ILogExplorerProps) => {
const dispatch = useDispatch();
const tabIds = useSelector(selectQueryTabs).queryTabIds.filter(
Expand Down Expand Up @@ -184,6 +185,7 @@ export const LogExplorer = ({
curSelectedTabId={curSelectedTabIdRef}
http={http}
searchBarConfigs={searchBarConfigs}
qm={qm}
/>
</>
),
Expand Down
10 changes: 6 additions & 4 deletions ...lorer/visualizations/config_panel/config_panes/config_controls/data_config_panel_item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,8 @@ import {
} from '../../../../../../../../common/constants/explorer';
import { ButtonGroupItem } from './config_button_group';
import { visChartTypes } from '../../../../../../../../common/constants/shared';
import { ConfigList } from '../../../../../../../../common/types/explorer';
import { ConfigList, DataConfigPanelProps } from '../../../../../../../../common/types/explorer';
import { TabContext } from '../../../../../hooks';
import { QueryManager } from '../../../../../../../../common/query_manager';
import { composeAggregations } from '../../../../../../../../common/query_manager/utils';

const initialDimensionEntry = {
Expand All @@ -47,7 +46,11 @@ const initialMetricEntry = {
aggregation: 'count',
};

export const DataConfigPanelItem = ({ fieldOptionList, visualizations }: any) => {
export const DataConfigPanelItem = ({
fieldOptionList,
visualizations,
qm,
}: DataConfigPanelProps) => {
const dispatch = useDispatch();
const { tabId, handleQuerySearch, handleQueryChange, setTempQuery, fetchData } = useContext<any>(
TabContext
Expand Down Expand Up @@ -120,7 +123,6 @@ export const DataConfigPanelItem = ({ fieldOptionList, visualizations }: any) =>
};

const updateChart = (updatedConfigList = configList) => {
const qm = new QueryManager();
const statsTokens = qm.queryParser().parse(data.query.rawQuery).getStats();
const newQuery = qm
.queryBuilder()
Expand Down
15 changes: 11 additions & 4 deletions .../visualizations/config_panel/config_panes/config_controls/logs_view_config_panel_item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,27 @@ import {
EuiText,
} from '@elastic/eui';
import { batch, useDispatch, useSelector } from 'react-redux';
import { cloneDeep } from 'lodash';
import {
AVAILABLE_FIELDS,
SELECTED_FIELDS,
} from '../../../../../../../../common/constants/explorer';
import { ConfigList, ConfigListEntry } from '../../../../../../../../common/types/explorer';
import {
ConfigList,
ConfigListEntry,
DataConfigPanelProps,
} from '../../../../../../../../common/types/explorer';
import { TabContext } from '../../../../../hooks';
import {
selectFields,
sortFields,
updateFields,
} from '../../../../../../event_analytics/redux/slices/field_slice';
import { cloneDeep } from 'lodash';

export const LogsViewConfigPanelItem = ({ fieldOptionList, visualizations }: any) => {
export const LogsViewConfigPanelItem = ({
fieldOptionList,
visualizations,
}: DataConfigPanelProps) => {
const dispatch = useDispatch();
const { tabId, curVisId, changeVisualizationConfig } = useContext<any>(TabContext);
const explorerFields = useSelector(selectFields)[tabId];
Expand Down Expand Up @@ -159,7 +166,7 @@ export const LogsViewConfigPanelItem = ({ fieldOptionList, visualizations }: any
};

const getLogsViewUI = () => {
let list = configList.dimensions ? configList.dimensions : [];
const list = configList.dimensions ? configList.dimensions : [];
const listUI = list.map((field, index) => (
<EuiFormRow
label="Field"
Expand Down
13 changes: 8 additions & 5 deletions ...er/visualizations/config_panel/config_panes/config_controls/treemap_config_panel_item.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,10 +22,14 @@ import {
import { ConfigTreemapParentFields } from './config_treemap_parents';
import { numericalTypes, RAW_QUERY } from '../../../../../../../../common/constants/explorer';
import { TabContext } from '../../../../../hooks';
import { QueryManager } from '../../../../../../../../common/query_manager';
import { composeAggregations } from '../../../../../../../../common/query_manager/utils';
import { DataConfigPanelProps } from '../../../../../../../../common/types/explorer';

export const TreemapConfigPanelItem = ({ fieldOptionList, visualizations, tabID }: any) => {
export const TreemapConfigPanelItem = ({
fieldOptionList,
visualizations,
qm,
}: DataConfigPanelProps) => {
const dispatch = useDispatch();
const { tabId, curVisId, changeVisualizationConfig, fetchData, handleQueryChange } = useContext<
any
Expand All @@ -51,7 +55,7 @@ export const TreemapConfigPanelItem = ({ fieldOptionList, visualizations, tabID
}, [userConfigs?.dataConfig, visualizations.vis.name]);

const updateList = (configName: string, fieldName: string, value: string | any[]) => {
let list = { ...configList };
const list = { ...configList };
let listItem = { ...list[configName][0] };

const newField = {
Expand All @@ -68,7 +72,6 @@ export const TreemapConfigPanelItem = ({ fieldOptionList, visualizations, tabID
};

const updateChart = (updatedConfigList = configList) => {
const qm = new QueryManager();
const statsTokens = qm.queryParser().parse(data.query.rawQuery).getStats();
const newQuery = qm
.queryBuilder()
Expand Down Expand Up @@ -103,7 +106,7 @@ export const TreemapConfigPanelItem = ({ fieldOptionList, visualizations, tabID

const getOptionsAvailable = (sectionName: string) => {
const { dimensions, metrics } = configList;
let selectedFields = {};
const selectedFields = {};
let allSelectedFields = [];

for (const key in configList) {
Expand Down
Loading