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

Edit visualization in Application Analytics #519

Merged
merged 2 commits into from
Mar 2, 2022
Merged

Edit visualization in Application Analytics #519

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0e29699
Edit visualization redirects to event tab
eugenesk24 Mar 1, 2022
9866d8d
Change Edit to Save
eugenesk24 Mar 2, 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
25 changes: 22 additions & 3 deletions dashboards-observability/public/components/application_analytics/components/application.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ import TimestampUtils from 'public/services/timestamp/timestamp';
import React, { ReactChild, useEffect, useState } from 'react';
import { uniqueId } from 'lodash';
import { useHistory } from 'react-router-dom';
import { useDispatch } from 'react-redux';
import {
filtersToDsl,
PanelTitle,
Expand Down Expand Up @@ -60,7 +61,6 @@ import { ServiceDetailFlyout } from './flyout_components/service_detail_flyout';
import { SpanDetailFlyout } from '../../../../public/components/trace_analytics/components/traces/span_detail_flyout';
import { TraceDetailFlyout } from './flyout_components/trace_detail_flyout';
import { fetchAppById, initializeTabData } from '../helpers/utils';
import { useDispatch } from 'react-redux';

const TAB_OVERVIEW_ID = uniqueId(TAB_OVERVIEW_ID_TXT_PFX);
const TAB_SERVICE_ID = uniqueId(TAB_SERVICE_ID_TXT_PFX);
Expand Down Expand Up @@ -134,6 +134,7 @@ export function Application(props: AppDetailProps) {
const [spanFlyoutId, setSpanFlyoutId] = useState<string>('');
const [spanDSL, setSpanDSL] = useState<any>({});
const [totalSpans, setTotalSpans] = useState<number>(0);
const [editVizId, setEditVizId] = useState<string>('');
const handleContentTabClick = (selectedTab: IQueryTab) => setSelectedTab(selectedTab.id);
const history = useHistory();

Expand Down Expand Up @@ -226,6 +227,7 @@ export function Application(props: AppDetailProps) {
appName={application.name}
setStartTime={setStartTimeForApp}
setEndTime={setEndTimeForApp}
switchToEditViz={switchToEditViz}
/>
);
};
Expand All @@ -241,6 +243,7 @@ export function Application(props: AppDetailProps) {
setStartTime={setStartTimeForApp}
setEndTime={setEndTimeForApp}
switchToTrace={switchToTrace}
switchToEditViz={switchToEditViz}
/>
);
};
Expand All @@ -260,6 +263,7 @@ export function Application(props: AppDetailProps) {
openTraceFlyout={openTraceFlyout}
setStartTime={setStartTimeForApp}
setEndTime={setEndTimeForApp}
switchToEditViz={switchToEditViz}
/>
<EuiSpacer size="m" />
<EuiPanel>
Expand Down Expand Up @@ -289,7 +293,7 @@ export function Application(props: AppDetailProps) {
setToast={setToasts}
history={history}
notifications={notifications}
savedObjectId={''}
savedObjectId={editVizId}
http={http}
searchBarConfigs={searchBarConfigs}
appId={appId}
Expand Down Expand Up @@ -325,6 +329,7 @@ export function Application(props: AppDetailProps) {
setStartTime={setStartTimeForApp}
setEndTime={setEndTimeForApp}
switchToEvent={switchToEvent}
switchToEditViz={switchToEditViz}
/>
);
};
Expand All @@ -333,9 +338,23 @@ export function Application(props: AppDetailProps) {
setSelectedTab(TAB_LOG_ID);
};

const switchToEditViz = (savedVizId: string) => {
if (savedVizId) {
setEditVizId(savedVizId);
switchToEvent();
} else {
setEditVizId('');
}
};

const getConfig = () => {
return (
<Configuration appId={appId} parentBreadcrumb={parentBreadcrumb} application={application} />
<Configuration
appId={appId}
parentBreadcrumb={parentBreadcrumb}
application={application}
switchToEditViz={switchToEditViz}
/>
);
};

Expand Down
9 changes: 7 additions & 2 deletions ...boards-observability/public/components/application_analytics/components/configuration.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
* Copyright OpenSearch Contributors
* SPDX-License-Identifier: Apache-2.0
*/
/* eslint-disable react-hooks/exhaustive-deps */

import {
EuiBreadcrumb,
Expand All @@ -22,16 +23,20 @@ import {
EuiTitle,
} from '@elastic/eui';
import { ApplicationType } from 'common/types/app_analytics';
import React from 'react';
import React, { useEffect } from 'react';

interface ConfigProps {
appId: string;
application: ApplicationType;
parentBreadcrumb: EuiBreadcrumb;
switchToEditViz: (savedVizId: string) => void;
}

export const Configuration = (props: ConfigProps) => {
const { appId, application, parentBreadcrumb } = props;
const { appId, application, parentBreadcrumb, switchToEditViz } = props;
useEffect(() => {
switchToEditViz('');
}, []);

return (
<div>
Expand Down
2 changes: 1 addition & 1 deletion dashboards-observability/public/components/application_analytics/components/create.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ export const CreateApp = (props: CreateAppProps) => {
href: '#/application_analytics',
},
{
text: editMode ? 'Edit' : 'Create',
text: editMode ? 'Save' : 'Create',
href: `#/application_analytics/${editMode ? 'edit' : 'create'}`,
},
]);
Expand Down
17 changes: 16 additions & 1 deletion dashboards-observability/public/components/custom_panels/custom_panel_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ interface Props {
setStartTime: any;
setEndTime: any;
switchToEvent?: any;
switchToEditViz?: any;
}

export const CustomPanelView = ({
Expand All @@ -109,6 +110,7 @@ export const CustomPanelView = ({
cloneCustomPanel,
setToast,
switchToEvent,
switchToEditViz,
}: Props) => {
const [openPanelName, setOpenPanelName] = useState('');
const [panelCreatedTime, setPanelCreatedTime] = useState('');
Expand Down Expand Up @@ -477,6 +479,13 @@ export const CustomPanelView = ({
},
];

// Set saved object id to empty when redirect away from events tab
useEffect(() => {
if (appPanel) {
switchToEditViz('');
}
});

// Fetch the custom panel on Initial Mount
useEffect(() => {
fetchCustomPanel();
Expand Down Expand Up @@ -626,7 +635,11 @@ export const CustomPanelView = ({
{appPanel && (
<>
<EuiFlexItem grow={false}>
<EuiButton iconType="pencil" onClick={() => {}} isDisabled={editDisabled}>
<EuiButton
iconType="pencil"
onClick={() => editPanel('edit')}
isDisabled={editDisabled}
>
Edit
</EuiButton>
</EuiFlexItem>
Expand Down Expand Up @@ -661,11 +674,13 @@ export const CustomPanelView = ({
pplService={pplService}
startTime={startTime}
endTime={endTime}
fromApp={appPanel}
onRefresh={onRefresh}
cloneVisualization={cloneVisualization}
pplFilterValue={pplFilterValue}
showFlyout={showFlyout}
editActionType={editActionType}
switchToEditViz={switchToEditViz}
/>
</EuiPageContentBody>
</EuiPageBody>
Expand Down
7 changes: 7 additions & 0 deletions ...rds-observability/public/components/custom_panels/panel_modules/panel_grid/panel_grid.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,11 +48,14 @@ type Props = {
pplService: PPLService;
startTime: string;
endTime: string;
fromApp?: boolean;
switchToEditViz?: any;
onRefresh: boolean;
cloneVisualization: (visualzationTitle: string, savedVisualizationId: string) => void;
pplFilterValue: string;
showFlyout: (isReplacement?: boolean | undefined, replaceVizId?: string | undefined) => void;
editActionType: string;
setEditVizId?: any;
};

export const PanelGrid = ({
Expand All @@ -65,6 +68,8 @@ export const PanelGrid = ({
pplService,
startTime,
endTime,
fromApp = false,
switchToEditViz,
onRefresh,
cloneVisualization,
pplFilterValue,
Expand Down Expand Up @@ -95,6 +100,8 @@ export const PanelGrid = ({
fromTime={startTime}
toTime={endTime}
onRefresh={onRefresh}
fromApp={fromApp}
switchToEditViz={switchToEditViz}
cloneVisualization={cloneVisualization}
pplFilterValue={pplFilterValue}
showFlyout={showFlyout}
Expand Down
10 changes: 9 additions & 1 deletion ...omponents/custom_panels/panel_modules/visualization_container/visualization_container.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ interface Props {
onRefresh: boolean;
pplFilterValue: string;
usedInNotebooks?: boolean;
fromApp?: boolean;
switchToEditViz?: any;
cloneVisualization?: (visualzationTitle: string, savedVisualizationId: string) => void;
showFlyout?: (isReplacement?: boolean | undefined, replaceVizId?: string | undefined) => void;
removeVisualization?: (visualizationId: string) => void;
Expand All @@ -69,6 +71,8 @@ export const VisualizationContainer = ({
onRefresh,
pplFilterValue,
usedInNotebooks,
fromApp,
switchToEditViz,
cloneVisualization,
showFlyout,
removeVisualization,
Expand All @@ -90,7 +94,11 @@ export const VisualizationContainer = ({
disabled={disablePopover}
onClick={() => {
closeActionsMenu();
window.location.assign(`#/event_analytics/explorer/${savedVisualizationId}`);
if (fromApp) {
switchToEditViz(savedVisualizationId);
} else {
window.location.assign(`#/event_analytics/explorer/${savedVisualizationId}`);
}
}}
>
Edit
Expand Down
36 changes: 34 additions & 2 deletions dashboards-observability/public/components/explorer/explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ import {
EVENT_ANALYTICS_DOCUMENTATION_URL,
TAB_EVENT_ID,
TAB_CHART_ID,
INDEX,
FINAL_QUERY,
} from '../../../common/constants/explorer';
import { PPL_STATS_REGEX, PPL_NEWLINE_REGEX } from '../../../common/constants/shared';
import { getIndexPatternFromRawQuery, preprocessQuery, buildQuery } from '../../../common/utils';
Expand Down Expand Up @@ -226,12 +228,15 @@ export const Explorer = ({
const isSavedQuery = has(savedData, SAVED_QUERY);
const savedType = isSavedQuery ? SAVED_QUERY : SAVED_VISUALIZATION;
const objectData = isSavedQuery ? savedData.savedQuery : savedData.savedVisualization;
const currQuery = appLogEvents
? objectData?.query.replace(appBaseQuery + '| ', '')
: objectData?.query || '';
batch(async () => {
await dispatch(
changeQuery({
tabId,
query: {
[RAW_QUERY]: objectData?.query || '',
[RAW_QUERY]: currQuery,
[SELECTED_TIMESTAMP]: objectData?.selected_timestamp?.name || 'timestamp',
[SAVED_OBJECT_ID]: objectId,
[SAVED_OBJECT_TYPE]: savedType,
Expand Down Expand Up @@ -460,6 +465,33 @@ export const Explorer = ({
}
}, []);

useEffect(() => {
if (appLogEvents) {
if (savedObjectId) {
updateTabData(savedObjectId);
} else {
emptyTab();
}
}
}, [savedObjectId]);

const emptyTab = async () => {
await dispatch(
changeQuery({
tabId,
query: {
[RAW_QUERY]: '',
[FINAL_QUERY]: '',
[INDEX]: '',
[SELECTED_TIMESTAMP]: '',
[SAVED_OBJECT_ID]: '',
[SELECTED_DATE_RANGE]: ['now-24h', 'now'],
},
})
);
await fetchData();
};

const handleAddField = (field: IField) => toggleFields(field, AVAILABLE_FIELDS, SELECTED_FIELDS);

const handleRemoveField = (field: IField) =>
Expand Down Expand Up @@ -1208,7 +1240,7 @@ export const Explorer = ({
<div className="dscAppContainer">
<Search
key="search-component"
query={appLogEvents ? tempQuery : query[RAW_QUERY]}
query={query[RAW_QUERY]}
tempQuery={tempQuery}
handleQueryChange={handleQueryChange}
handleQuerySearch={handleQuerySearch}
Expand Down
14 changes: 2 additions & 12 deletions dashboards-observability/public/components/explorer/log_explorer.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,22 +16,13 @@ import {
TAB_ID_TXT_PFX,
SAVED_OBJECT_ID,
NEW_TAB,
TAB_CREATED_TYPE,
REDIRECT_TAB,
NEW_SELECTED_QUERY_TAB,
TAB_EVENT_ID,
TAB_CHART_ID,
} from '../../../common/constants/explorer';
import { selectQueryTabs, addTab, setSelectedQueryTab, removeTab } from './slices/query_tab_slice';
import { selectQueryTabs, setSelectedQueryTab } from './slices/query_tab_slice';
import { selectQueries } from './slices/query_slice';
import { init as initFields, remove as removefields } from './slices/field_slice';
import { init as initQuery, remove as removeQuery, changeQuery } from './slices/query_slice';
import {
init as initQueryResult,
remove as removeQueryResult,
selectQueryResult,
} from './slices/query_result_slice';
import { init as initVisualizationConfig, reset as resetVisualizationConfig } from './slices/viualization_config_slice';
import { selectQueryResult } from './slices/query_result_slice';
import { initializeTabData, removeTabData } from '../application_analytics/helpers/utils';

const searchBarConfigs = {
Expand Down Expand Up @@ -140,7 +131,6 @@ export const LogExplorer = ({
return newTabId;
};


useEffect(() => {
if (!isEmpty(savedObjectId)) {
dispatchSavedObjectId();
Expand Down
6 changes: 5 additions & 1 deletion ...boards-observability/public/components/trace_analytics/components/dashboard/dashboard.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,12 @@ import { DashboardTable } from './dashboard_table';
interface DashboardProps extends TraceAnalyticsComponentDeps {
appId?: string;
appName?: string;
switchToEditViz?: any;
page: 'dashboard' | 'traces' | 'services' | 'app';
}

export function Dashboard(props: DashboardProps) {
const { appId, appName, page, parentBreadcrumb } = props;
const { appId, appName, page, parentBreadcrumb, switchToEditViz } = props;
const [tableItems, setTableItems] = useState([]);
const [throughputPltItems, setThroughputPltItems] = useState({ items: [], fixedInterval: '1h' });
const [errorRatePltItems, setErrorRatePltItems] = useState({ items: [], fixedInterval: '1h' });
Expand Down Expand Up @@ -80,6 +81,9 @@ export function Dashboard(props: DashboardProps) {
})),
]);
setRedirect(false);
if (appOverview) {
switchToEditViz('');
}
}, []);

useEffect(() => {
Expand Down
Loading