Skip to content

ref(navigation): Remove navigation tour #118381

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
malwilley wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ref(navigation): Remove navigation tour #118381

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
17 changes: 4 additions & 13 deletions static/app/components/onboardingWizard/content.spec.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ import {

import {OnboardingSidebarContent} from 'sentry/components/onboardingWizard/content';
import {OnboardingTaskKey} from 'sentry/types/onboarding';
import {NavigationTourProvider} from 'sentry/views/navigation/navigationTour';
import {PrimaryNavigationContextProvider} from 'sentry/views/navigation/primaryNavigationContext';

const DEFAULT_GETTING_STARTED_TASKS = [
Expand Down Expand Up @@ -57,9 +56,7 @@ describe('OnboardingSidebarContent', () => {
it('should render the sidebar with the correct groups and tasks', async () => {
render(
<PrimaryNavigationContextProvider>
<NavigationTourProvider>
<OnboardingSidebarContent onClose={jest.fn()} />
</NavigationTourProvider>
<OnboardingSidebarContent onClose={jest.fn()} />
</PrimaryNavigationContextProvider>,
{organization}
);
Expand Down Expand Up @@ -112,9 +109,7 @@ describe('OnboardingSidebarContent', () => {

render(
<PrimaryNavigationContextProvider>
<NavigationTourProvider>
<OnboardingSidebarContent onClose={jest.fn()} />
</NavigationTourProvider>
<OnboardingSidebarContent onClose={jest.fn()} />
</PrimaryNavigationContextProvider>,
{organization}
);
Expand All @@ -126,9 +121,7 @@ describe('OnboardingSidebarContent', () => {
it('if first group completed, second group should be expanded by default', async () => {
render(
<PrimaryNavigationContextProvider>
<NavigationTourProvider>
<OnboardingSidebarContent onClose={jest.fn()} />
</NavigationTourProvider>
<OnboardingSidebarContent onClose={jest.fn()} />
</PrimaryNavigationContextProvider>,
{
organization: OrganizationFixture({
Expand All @@ -154,9 +147,7 @@ describe('OnboardingSidebarContent', () => {

render(
<PrimaryNavigationContextProvider>
<NavigationTourProvider>
<OnboardingSidebarContent onClose={jest.fn()} />
</NavigationTourProvider>
<OnboardingSidebarContent onClose={jest.fn()} />
</PrimaryNavigationContextProvider>,
{organization}
);
Expand Down
7 changes: 1 addition & 6 deletions static/app/components/onboardingWizard/content.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ import {useLocalStorageState} from 'sentry/utils/useLocalStorageState';
import {useLocation} from 'sentry/utils/useLocation';
import {useNavigate} from 'sentry/utils/useNavigate';
import {useOrganization} from 'sentry/utils/useOrganization';
import {useNavigationTour} from 'sentry/views/navigation/navigationTour';

/**
* How long (in ms) to delay before beginning to mark tasks complete
Expand Down Expand Up @@ -183,7 +182,6 @@ function Task({task, hidePanel}: TaskProps) {
const [showSkipConfirmation, setShowSkipConfirmation] = useState(false);

const tours = useDemoTours();
const sidebarTour = useNavigationTour();

const handleClick = useCallback(
(e: React.MouseEvent) => {
Expand All @@ -199,9 +197,6 @@ function Task({task, hidePanel}: TaskProps) {
if (isDemoModeActive()) {
if (task.task === OnboardingTaskKey.PERFORMANCE_GUIDE) {
tours?.[DemoTour.PERFORMANCE]?.startTour();
} else if (task.task === OnboardingTaskKey.SIDEBAR_GUIDE) {
// Demo mode uses existing sidebar tour
sidebarTour.startTour();
} else if (task.task === OnboardingTaskKey.RELEASE_GUIDE) {
tours?.[DemoTour.RELEASES]?.startTour();
} else if (task.task === OnboardingTaskKey.ISSUE_GUIDE) {
Expand Down Expand Up @@ -230,7 +225,7 @@ function Task({task, hidePanel}: TaskProps) {
}
hidePanel();
},
[task, organization, navigate, location, hidePanel, tours, sidebarTour]
[task, organization, navigate, location, hidePanel, tours]
);

const handleMarkSkipped = () => {
Expand Down
4 changes: 0 additions & 4 deletions static/app/utils/analytics/navigationAnalyticsEvents.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ type NavigationEventParameters = {
'navigation.help_menu_opt_out_stacked_navigation_clicked': Record<string, unknown>;
'navigation.primary_item_clicked': NavigationItemClicked;
'navigation.secondary_item_clicked': NavigationItemClicked;
'navigation.tour_modal_dismissed': Record<string, unknown>;
'navigation.tour_modal_shown': Record<string, unknown>;
};

type NavigationEventKey = keyof NavigationEventParameters;
Expand All @@ -20,6 +18,4 @@ export const navigationAnalyticsEventMap: Record<NavigationEventKey, string | nu
'Navigation: Help Menu Opt Out Of Stacked Navigation Clicked',
'navigation.primary_item_clicked': 'Navigation: Primary Item Clicked',
'navigation.secondary_item_clicked': 'Navigation: Secondary Item Clicked',
'navigation.tour_modal_dismissed': 'Navigation: Tour Modal Dismissed',
'navigation.tour_modal_shown': 'Navigation: Tour Modal Shown',
};
20 changes: 2 additions & 18 deletions static/app/views/explore/spans/tour.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import {StartTourModal, startTourModalCss} from 'sentry/components/tours/startTo
import type {TourContextType} from 'sentry/components/tours/tourContext';
import {useAssistant, useMutateAssistant} from 'sentry/components/tours/useAssistant';
import {t} from 'sentry/locale';
import {useIsNavigationTourActive} from 'sentry/views/navigation/navigationTour';

export const enum ExploreSpansTour {
// Specify keywords to narrow down search
Expand Down Expand Up @@ -54,15 +53,8 @@ export function useExploreSpansTourModal() {
assistantData?.find(item => item.guide === EXPLORE_SPANS_TOUR_GUIDE_KEY)?.seen ===
false;

const isNavTourActive = useIsNavigationTourActive();

useEffect(() => {
if (
isRegistered &&
shouldShowTourModal &&
!hasOpenedTourModal.current &&
!isNavTourActive
) {
if (isRegistered && shouldShowTourModal && !hasOpenedTourModal.current) {
hasOpenedTourModal.current = true;
openModal(
props => (
Expand Down Expand Up @@ -104,15 +96,7 @@ export function useExploreSpansTourModal() {
}
);
}
}, [
isRegistered,
shouldShowTourModal,
startTour,
mutateAssistant,
endTour,
isNavTourActive,
openModal,
]);
}, [isRegistered, shouldShowTourModal, startTour, mutateAssistant, endTour, openModal]);
}

const Title = styled('div')`
Expand Down
15 changes: 4 additions & 11 deletions static/app/views/navigation/index.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,6 @@ import {HoverOverlayGroupProvider} from 'sentry/utils/useHoverOverlay';
import {useOrganization} from 'sentry/utils/useOrganization';
import {MobileNavigation} from 'sentry/views/navigation/mobileNavigation';
import {Navigation as DesktopNavigation} from 'sentry/views/navigation/navigation';
import {
NavigationTourProvider,
useNavigationTour,
} from 'sentry/views/navigation/navigationTour';
import {PrimaryNavigation} from 'sentry/views/navigation/primary/components';
import {UserDropdown} from 'sentry/views/navigation/primary/userDropdown';
import {usePrimaryNavigation} from 'sentry/views/navigation/primaryNavigationContext';
Expand Down Expand Up @@ -94,19 +90,18 @@ function UserOnlyNavigation() {
function NavigationLayout({children}: {children: React.ReactNode}) {
const theme = useTheme();
const {layout} = usePrimaryNavigation();
const {currentStepId} = useNavigationTour();
const hoverProps = useResetActiveNavigationGroup();
const {barTop} = useTopOffset();

return (
<Flex
top={barTop}
left={0}
position={currentStepId ? undefined : 'sticky'}
position="sticky"
bottom={layout === 'mobile' ? undefined : 0}
height={layout === 'mobile' ? undefined : `calc(100dvh - ${barTop})`}
style={{
zIndex: currentStepId ? undefined : theme.zIndex.sidebarPanel,
zIndex: theme.zIndex.sidebarPanel,
userSelect: 'none',
}}
{...hoverProps}
Expand All @@ -130,10 +125,8 @@ export function Navigation() {

return (
<HoverOverlayGroupProvider>
<NavigationTourProvider>
<SkipLink />
<UserAndOrganizationNavigation />
</NavigationTourProvider>
<SkipLink />
<UserAndOrganizationNavigation />
</HoverOverlayGroupProvider>
);
}
Expand Down
Loading
Loading