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

Fix trace analytics navigaiton #360

Merged
merged 1 commit into from
Apr 17, 2023
Merged

Fix trace analytics navigaiton #360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions public/components/trace_analytics/components/dashboard/dashboard_content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ export function DashboardContent(props: DashboardProps) {
startTime,
endTime,
childBreadcrumbs,
parentBreadcrumbs,
parentBreadcrumb,
filters,
setStartTime,
setEndTime,
Expand Down Expand Up @@ -83,7 +83,7 @@ export function DashboardContent(props: DashboardProps) {
}, [showTimeoutToast]);

useEffect(() => {
// chrome.setBreadcrumbs([...parentBreadcrumbs, ...childBreadcrumbs]);
chrome.setBreadcrumbs([parentBreadcrumb, ...childBreadcrumbs]);
const validFilters = getValidFilterFields(mode, page);
setFilters([
...filters.map((filter) => ({
Expand Down
2 changes: 1 addition & 1 deletion public/components/trace_analytics/components/services/service_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export function ServiceView(props: ServiceViewProps) {

useEffect(() => {
props.chrome.setBreadcrumbs([
...props.parentBreadcrumbs,
props.parentBreadcrumb,
{
text: 'Trace analytics',
href: '#/trace_analytics/home',
Expand Down
37 changes: 29 additions & 8 deletions public/components/trace_analytics/components/services/services_content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ export function ServicesContent(props: ServicesProps) {
endTime,
appConfigs = [],
childBreadcrumbs,
parentBreadcrumbs,
parentBreadcrumb,
nameColumnAction,
traceColumnAction,
setFilters,
Expand All @@ -51,7 +51,7 @@ export function ServicesContent(props: ServicesProps) {
const [filteredService, setFilteredService] = useState('');

useEffect(() => {
chrome.setBreadcrumbs([...parentBreadcrumbs, ...childBreadcrumbs]);
chrome.setBreadcrumbs([parentBreadcrumb, ...childBreadcrumbs]);
const validFilters = getValidFilterFields(mode, 'services');
setFilters([
...filters.map((filter) => ({
Expand All @@ -71,20 +71,39 @@ export function ServicesContent(props: ServicesProps) {
}
}
setFilteredService(newFilteredService);
if (!redirect && ((mode === 'data_prepper' && dataPrepperIndicesExist) || (mode === 'jaeger' && jaegerIndicesExist))) refresh(newFilteredService);
if (
!redirect &&
((mode === 'data_prepper' && dataPrepperIndicesExist) ||
(mode === 'jaeger' && jaegerIndicesExist))
)
refresh(newFilteredService);
}, [filters, appConfigs, redirect, mode, jaegerIndicesExist, dataPrepperIndicesExist]);

const refresh = async (currService?: string) => {
setLoading(true);
const DSL = filtersToDsl(mode, filters, query,processTimeStamp(startTime, mode), processTimeStamp(endTime, mode), page, appConfigs);
const DSL = filtersToDsl(
mode,
filters,
query,
processTimeStamp(startTime, mode),
processTimeStamp(endTime, mode),
page,
appConfigs
);
// service map should not be filtered by service name
const serviceMapDSL = _.cloneDeep(DSL);
serviceMapDSL.query.bool.must = serviceMapDSL.query.bool.must.filter(
(must: any) => must?.term?.serviceName == null
);
await Promise.all([
handleServicesRequest(http, DSL, setTableItems, mode),
handleServiceMapRequest(http, serviceMapDSL, mode, setServiceMap, currService || filteredService),
handleServiceMapRequest(
http,
serviceMapDSL,
mode,
setServiceMap,
currService || filteredService
),
]);
setLoading(false);
};
Expand Down Expand Up @@ -133,16 +152,18 @@ export function ServicesContent(props: ServicesProps) {
dataPrepperIndicesExist={dataPrepperIndicesExist}
/>
<EuiSpacer size="m" />
{ (mode === 'data_prepper' && dataPrepperIndicesExist) ?
{mode === 'data_prepper' && dataPrepperIndicesExist ? (
<ServiceMap
addFilter={addFilter}
serviceMap={serviceMap}
idSelected={serviceMapIdSelected}
setIdSelected={setServiceMapIdSelected}
currService={filteredService}
page={page}
/> : (<div/>)
}
/>
) : (
<div />
)}
</>
);
}
2 changes: 1 addition & 1 deletion public/components/trace_analytics/components/traces/trace_view.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ export function TraceView(props: TraceViewProps) {

useEffect(() => {
props.chrome.setBreadcrumbs([
...props.parentBreadcrumbs,
props.parentBreadcrumb,
{
text: 'Trace analytics',
href: '#/trace_analytics/home',
Expand Down
30 changes: 25 additions & 5 deletions public/components/trace_analytics/components/traces/traces_content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ export function TracesContent(props: TracesProps) {
appConfigs,
startTime,
endTime,
parentBreadcrumbs,
parentBreadcrumb,
childBreadcrumbs,
traceIdColumnAction,
setQuery,
Expand All @@ -39,7 +39,7 @@ export function TracesContent(props: TracesProps) {
const [loading, setLoading] = useState(false);

useEffect(() => {
chrome.setBreadcrumbs([...parentBreadcrumbs, ...childBreadcrumbs]);
chrome.setBreadcrumbs([parentBreadcrumb, ...childBreadcrumbs]);
const validFilters = getValidFilterFields(mode, 'traces');
setFilters([
...filters.map((filter) => ({
Expand All @@ -51,13 +51,33 @@ export function TracesContent(props: TracesProps) {
}, []);

useEffect(() => {
if (!redirect && ((mode === 'data_prepper' && dataPrepperIndicesExist) || (mode === 'jaeger' && jaegerIndicesExist))) refresh();
if (
!redirect &&
((mode === 'data_prepper' && dataPrepperIndicesExist) ||
(mode === 'jaeger' && jaegerIndicesExist))
)
refresh();
}, [filters, appConfigs, redirect, mode, dataPrepperIndicesExist, jaegerIndicesExist]);

const refresh = async (sort?: PropertySort) => {
setLoading(true);
const DSL = filtersToDsl(mode, filters, query, processTimeStamp(startTime, mode), processTimeStamp(endTime, mode), page, appConfigs);
const timeFilterDSL = filtersToDsl(mode, [], '', processTimeStamp(startTime, mode), processTimeStamp(endTime, mode), page);
const DSL = filtersToDsl(
mode,
filters,
query,
processTimeStamp(startTime, mode),
processTimeStamp(endTime, mode),
page,
appConfigs
);
const timeFilterDSL = filtersToDsl(
mode,
[],
'',
processTimeStamp(startTime, mode),
processTimeStamp(endTime, mode),
page
);
await handleTracesRequest(http, DSL, timeFilterDSL, tableItems, setTableItems, mode, sort);
setLoading(false);
};
Expand Down
Loading