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

fix: remove requirement of exceptionType and serviceName from errorDetail page URL #1400

Merged
merged 4 commits into from
Jul 15, 2022
Merged

fix: remove requirement of exceptionType and serviceName from errorDetail page URL #1400

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
16d7986
fix: remove requirement of exceptionType and serviceName from errorDe…
makeavish Jul 15, 2022
79f1b94
chore: id is updated
palashgdev Jul 15, 2022
4002731
chore: commented code is removed
palashgdev Jul 15, 2022
abfda42
chore: eslint error is fixed
palashgdev Jul 15, 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
4 changes: 1 addition & 3 deletions frontend/src/container/AllError/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,7 @@ function AllErrors(): JSX.Element {
render: (value, record): JSX.Element => (
<Tooltip overlay={(): JSX.Element => value}>
<Link
to={`${ROUTES.ERROR_DETAIL}?serviceName=${
record.serviceName
}&exceptionType=${record.exceptionType}&groupId=${
to={`${ROUTES.ERROR_DETAIL}?groupId=${
record.groupID
}&timestamp=${getNanoSeconds(record.lastSeen)}`}
>
Expand Down
8 changes: 3 additions & 5 deletions frontend/src/container/ErrorDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,9 @@ function ErrorDetails(props: ErrorDetailsProps): JSX.Element {
}

history.replace(
`${history.location.pathname}?${urlKey.serviceName}=${serviceName}&${
urlKey.exceptionType
}=${errorType}&groupId=${idPayload.groupID}&timestamp=${getNanoSeconds(
timespamp,
)}&errorId=${id}`,
`${history.location.pathname}?&groupId=${
idPayload.groupID
}&timestamp=${getNanoSeconds(timespamp)}&errorId=${id}`,
);
} catch (error) {
notification.error({
Expand Down
37 changes: 9 additions & 28 deletions frontend/src/pages/ErrorDetails/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,6 @@ function ErrorDetails(): JSX.Element {
const { search } = useLocation();
const params = useMemo(() => new URLSearchParams(search), [search]);

const serviceName = params.get(urlKey.serviceName);
const expectionType = params.get(urlKey.exceptionType);
const groupId = params.get(urlKey.groupId);
const errorId = params.get(urlKey.errorId);
const timestamp = params.get(urlKey.timestamp);
Expand All @@ -50,34 +48,17 @@ function ErrorDetails(): JSX.Element {
},
);

const { data, status } = useQuery(
[
'expectionType',
expectionType,
'serviceName',
serviceName,
maxTime,
minTime,
groupId,
],
{
queryFn: () =>
getByErrorType({
groupID: groupId || '',
timestamp: timestamp || '',
}),
enabled:
!!expectionType && !!serviceName && !!groupId && IdStatus !== 'success',
},
);
const { data, status } = useQuery([maxTime, minTime, groupId], {
queryFn: () =>
getByErrorType({
groupID: groupId || '',
timestamp: timestamp || '',
}),
enabled: !!groupId && IdStatus !== 'success',
});

// if errorType and serviceName is null redirecting to the ALL_ERROR page not now
if (
serviceName === null ||
expectionType === null ||
groupId === null ||
timestamp === null
) {
if (groupId === null || timestamp === null) {
return <Redirect to={ROUTES.ALL_ERROR} />;
}

Expand Down