Skip to content

feat(explore): Persist explore toolbar state with local storage #97952

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat(explore): Persist explore toolbar state with local storage #97952

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
22 changes: 19 additions & 3 deletions static/app/views/explore/logs/logsTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import {parsePeriodToHours} from 'sentry/utils/duration/parsePeriodToHours';
import {AggregationKey} from 'sentry/utils/fields';
import {HOUR} from 'sentry/utils/formatters';
import {useQueryClient, type InfiniteData} from 'sentry/utils/queryClient';
import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
import useOrganization from 'sentry/utils/useOrganization';
import usePageFilters from 'sentry/utils/usePageFilters';
import SchemaHintsList, {
Expand Down Expand Up @@ -131,7 +132,7 @@ export function LogsTabContent({
return sortBys.map(formatSort);
}, [sortBys]);

const [sidebarOpen, setSidebarOpen] = useState(
const [sidebarOpen, setSidebarOpen] = useSidebarOpen(
!!(
groupBys.some(Boolean) ||
visualizes.some(
Expand Down Expand Up @@ -255,7 +256,7 @@ export function LogsTabContent({
setMode(Mode.SAMPLES);
}
},
[setMode]
[setSidebarOpen, setMode]
);

const saveAsItems = useSaveAsItems({
Expand Down Expand Up @@ -359,7 +360,7 @@ export function LogsTabContent({
size="xs"
/>
}
onClick={() => setSidebarOpen(x => !x)}
onClick={() => setSidebarOpen(!sidebarOpen)}
/>
</Feature>
<LogsGraphContainer>
Expand Down Expand Up @@ -423,3 +424,18 @@ export function LogsTabContent({
</SearchQueryBuilderProvider>
);
}

function useSidebarOpen(defaultExpanded: boolean) {
const [sidebarOpen, _setSidebarOpen] = useLocalStorageState(
'explore-logs-toolbar',
defaultExpanded ? 'expanded' : ''
);

const setSidebarOpen = useCallback(
(expanded: boolean) => {
_setSidebarOpen(expanded ? 'expanded' : '');
},
[_setSidebarOpen]
);
return [sidebarOpen === 'expanded', setSidebarOpen] as const;
}
25 changes: 9 additions & 16 deletions static/app/views/explore/spans/spansTab.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,10 @@ import {
ALLOWED_EXPLORE_VISUALIZE_AGGREGATES,
type AggregationKey,
} from 'sentry/utils/fields';
import {decodeScalar} from 'sentry/utils/queryString';
import {chonkStyled} from 'sentry/utils/theme/theme.chonk';
import {withChonk} from 'sentry/utils/theme/withChonk';
import {MutableSearch} from 'sentry/utils/tokenizeSearch';
import {useLocation} from 'sentry/utils/useLocation';
import {useNavigate} from 'sentry/utils/useNavigate';
import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
import useOrganization from 'sentry/utils/useOrganization';
import usePageFilters from 'sentry/utils/usePageFilters';
import usePrevious from 'sentry/utils/usePrevious';
Expand Down Expand Up @@ -104,24 +102,19 @@ export function SpansTabOnboarding({
}

function useControlSectionExpanded() {
const location = useLocation();
const navigate = useNavigate();
const controlSectionExpanded = decodeScalar(location.query.toolbar);
const [controlSectionExpanded, _setControlSectionExpanded] = useLocalStorageState(
'explore-spans-toolbar',
'expanded'
);

const setControlSectionExpanded = useCallback(
(expanded: boolean) => {
const newControlSectionExpanded = expanded ? undefined : 'collapsed';
navigate({
...location,
query: {
...location.query,
toolbar: newControlSectionExpanded,
},
});
_setControlSectionExpanded(expanded ? 'expanded' : '');
},
[location, navigate]
[_setControlSectionExpanded]
);

return [controlSectionExpanded !== 'collapsed', setControlSectionExpanded] as const;
return [controlSectionExpanded === 'expanded', setControlSectionExpanded] as const;
}

interface SpanTabProps {
Expand Down
Loading