Skip to content

Commit 68025fe

Browse files
author
Adam Tackett
committed
fix redirection services to traces
Signed-off-by: Adam Tackett <[email protected]>
1 parent ea6e420 commit 68025fe

File tree

1 file changed

+24
-2
lines changed

1 file changed

+24
-2
lines changed

public/components/trace_analytics/components/services/service_view.tsx

+24-2
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,10 @@ import {
3535
DEFAULT_DATA_SOURCE_NAME,
3636
DEFAULT_DATA_SOURCE_TYPE,
3737
} from '../../../../../common/constants/data_sources';
38-
import { observabilityLogsID } from '../../../../../common/constants/shared';
38+
import {
39+
observabilityLogsID,
40+
observabilityTracesNewNavID,
41+
} from '../../../../../common/constants/shared';
3942
import { TRACE_ANALYTICS_DATE_FORMAT } from '../../../../../common/constants/trace_analytics';
4043
import { setNavBreadCrumbs } from '../../../../../common/utils/set_nav_bread_crumbs';
4144
import { coreRefs } from '../../../../framework/core_refs';
@@ -80,6 +83,7 @@ export function ServiceView(props: ServiceViewProps) {
8083
const location = useLocation();
8184
const [isServiceOverviewLoading, setIsServiceOverviewLoading] = useState(false);
8285
const [isServicesDataLoading, setIsServicesDataLoading] = useState(false);
86+
const newNavigation = coreRefs.chrome?.navGroup.getNavGroupEnabled();
8387

8488
useEffect(() => {
8589
try {
@@ -165,7 +169,25 @@ export function ServiceView(props: ServiceViewProps) {
165169
inverted: false,
166170
disabled: false,
167171
});
168-
location.assign('#/traces');
172+
173+
const tracesPath = '#/traces';
174+
const dataSourceId = props.dataSourceMDSId[0]?.id || '';
175+
const urlParts = window.location.href.split('?');
176+
const queryParams =
177+
urlParts.length > 1 ? new URLSearchParams(urlParts[1]) : new URLSearchParams();
178+
179+
const modeParam = queryParams.get('mode') || '';
180+
const modeQuery = modeParam ? `&mode=${encodeURIComponent(modeParam)}` : '';
181+
182+
if (newNavigation) {
183+
coreRefs.application?.navigateToApp(observabilityTracesNewNavID, {
184+
path: `${tracesPath}?datasourceId=${encodeURIComponent(dataSourceId)}${modeQuery}`,
185+
});
186+
} else {
187+
window.location.assign(
188+
`${tracesPath}?datasourceId=${encodeURIComponent(dataSourceId)}${modeQuery}`
189+
);
190+
}
169191
};
170192

171193
useEffect(() => {

0 commit comments

Comments
 (0)