Skip to content

Fix sidebar tab selection #1378

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

Merged
merged 1 commit into from
May 19, 2025
Merged

Fix sidebar tab selection #1378

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
35 changes: 16 additions & 19 deletions src/components/Admin/common/RepositorySidebarOverlay/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import History, {
type HistoryEntry,
type HistoryEntryLocation
} from "../../../../history/History";
import { usePrevious } from "../../../../hooks/usePrevious";
import {
digmaApi,
useGetSpanInfoQuery
Expand Down Expand Up @@ -70,18 +71,10 @@ export const RepositorySidebarOverlay = ({
);
const { resetInsights, resetAssets, resetGlobalErrors } = useStore.getState();
const dispatch = useAdminDispatch();
const [history] = useState(
() =>
new History<RepositorySidebarHistoryState>([
{
location: window.location,
state: {
spanCodeObjectId: currentSpanCodeObjectId,
tabLocation: currentTabLocation
}
}
])
const [history, setHistory] = useState(
() => new History<RepositorySidebarHistoryState>([])
);
const previousIsSidebarOpen = usePrevious(isSidebarOpen);

const { data: spanInfo } = useGetSpanInfoQuery(
{ spanCodeObjectId: currentSpanCodeObjectId ?? "" },
Expand Down Expand Up @@ -172,17 +165,21 @@ export const RepositorySidebarOverlay = ({
resetInsights();
resetAssets();
resetGlobalErrors();
history.clear();
setCurrentTabLocation(initialTabLocation);
setCurrentSpanCodeObjectId(undefined);
setCurrentTabLocation(initialTabLocation);
onSidebarClose();
}, [dispatch, onSidebarClose, resetAssets, resetGlobalErrors, resetInsights]);

// Reset history on sidebar open
useEffect(() => {
if (!previousIsSidebarOpen && isSidebarOpen) {
setHistory(new History<RepositorySidebarHistoryState>([]));
}
}, [
dispatch,
onSidebarClose,
resetAssets,
resetGlobalErrors,
resetInsights,
history
previousIsSidebarOpen,
isSidebarOpen,
currentSpanCodeObjectId,
currentTabLocation
]);

useEffect(() => {
Expand Down
2 changes: 1 addition & 1 deletion ...e/InsightCardRenderer/insightCards/common/InsightCard/InsightHeader/InsightIcon/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export const InsightIcon = ({
return (
<Tag
title={<InsightIconTooltip {...{ severity, impact, criticality }} />}
titlePlacement={"bottom"}
titlePlacement={"bottom-start"}
type={tagType}
content={
<s.InsightIconContainer>
Expand Down
Loading