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.

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

feat(flags): add CTA to flag drawer #87354

Open
wants to merge 23 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
b43e3e7
feat(flags): add feature flag audit log table to tags dist drawer
michellewzhang Mar 17, 2025
ec89ac0
:white_check_mark: tests
michellewzhang Mar 17, 2025
d4f2631
:twisted_rightwards_arrows: merge master
michellewzhang Mar 17, 2025
db8a3ac
:twisted_rightwards_arrows: merge fix
michellewzhang Mar 17, 2025
f8e8f6a
:pencil2: wording
michellewzhang Mar 17, 2025
31e352b
:recycle: pr comments 1
michellewzhang Mar 18, 2025
e28485f
:sparkles: add back button for empty state
michellewzhang Mar 18, 2025
5a9488f
:art: simplify props
michellewzhang Mar 18, 2025
fe137fd
:lipstick: style comments
michellewzhang Mar 18, 2025
50dc510
:recycle: simplify tags path
michellewzhang Mar 18, 2025
e73a5c4
:fire: rm location params
michellewzhang Mar 18, 2025
2ab9e7a
:art: clear cursor on drawer close & new link component
michellewzhang Mar 18, 2025
551bd35
:bug: ugh copy and paste
michellewzhang Mar 18, 2025
24d9343
:bug: add div
michellewzhang Mar 18, 2025
e3c6f06
feat(flags): add CTA to flag drawer
aliu39 Mar 18, 2025
2555714
Merge branch 'mz/add-flags-audit-log-drawer' of github.com:getsentry/…
aliu39 Mar 18, 2025
0d45275
Fix setup sidebar analytics event
aliu39 Mar 18, 2025
ddd6256
Don't check cta ff
aliu39 Mar 18, 2025
d02d4e3
Style
aliu39 Mar 18, 2025
62e7f9f
Rename CardContent
aliu39 Mar 18, 2025
0c0ddfa
Update inline cta style and reword drawer cta
aliu39 Mar 19, 2025
67c84f6
Merge branch 'master' into aliu/ff-dist-cta
aliu39 Mar 19, 2025
103e983
:hammer_and_wrench: apply pre-commit fixes
getsantry[bot] Mar 19, 2025
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
Original file line number Diff line number Diff line change
Expand Up @@ -219,11 +219,13 @@ export function EventFeatureFlagList({
}

// contexts.flags is not set and project has not ingested flags
if (!hasFlagContext && !project.hasFlags) {
const showCTA =
featureFlagOnboardingPlatforms.includes(project.platform ?? 'other') &&
organization.features.includes('feature-flag-cta');
return showCTA ? <FeatureFlagInlineCTA projectId={event.projectID} /> : null;
if (
!hasFlagContext &&
!project.hasFlags &&
featureFlagOnboardingPlatforms.includes(project.platform ?? 'other') &&
organization.features.includes('feature-flag-cta')
) {
return <FeatureFlagInlineCTA projectId={event.projectID} />;
}

const actions = (
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import styled from '@emotion/styled';

import onboardingInstall from 'sentry-images/spot/onboarding-install.svg';

import {usePrompt} from 'sentry/actionCreators/prompts';
import ButtonBar from 'sentry/components/buttonBar';
import {Button, LinkButton} from 'sentry/components/core/button';
Expand All @@ -20,7 +22,10 @@ export default function FeatureFlagInlineCTA({projectId}: {projectId: string}) {
const {activateSidebar} = useFeatureFlagOnboarding();

function handleSetupButtonClick(e: any) {
trackAnalytics('flags.setup_modal_opened', {organization});
trackAnalytics('flags.setup_sidebar_opened', {
organization,
surface: 'issue_details.flags_section',
});
trackAnalytics('flags.cta_setup_button_clicked', {organization});
activateSidebar(e);
}
Expand Down Expand Up @@ -74,7 +79,7 @@ export default function FeatureFlagInlineCTA({projectId}: {projectId: string}) {
actions={actions}
>
<BannerWrapper>
<div>
<BannerContent>
<BannerTitle>{t('Set Up Feature Flags')}</BannerTitle>
<BannerDescription>
{t(
Expand All @@ -93,7 +98,7 @@ export default function FeatureFlagInlineCTA({projectId}: {projectId: string}) {
{t('Read More')}
</LinkButton>
</ActionButton>
</div>
</BannerContent>
<CloseDropdownMenu
position="bottom-end"
triggerProps={{
Expand Down Expand Up @@ -127,6 +132,7 @@ export default function FeatureFlagInlineCTA({projectId}: {projectId: string}) {
},
]}
/>
<BannerIllustration src={onboardingInstall} alt="Install" />
</BannerWrapper>
</InterimSection>
);
Expand All @@ -143,6 +149,22 @@ const BannerDescription = styled('div')`
max-width: 340px;
`;

const BannerContent = styled('div')`
padding: ${space(2)};
display: flex;
flex-direction: column;
justify-content: center;
`;

const BannerIllustration = styled('img')`
height: 100%;
object-fit: contain;
max-width: 30%;
margin-right: 10px;
margin-bottom: -${space(2)};
padding: ${space(2)};
`;

const CloseDropdownMenu = styled(DropdownMenu)`
position: absolute;
display: block;
Expand Down Expand Up @@ -170,4 +192,9 @@ const BannerWrapper = styled('div')`
${p => p.theme.backgroundSecondary}FF 70%,
${p => p.theme.backgroundSecondary}FF 100%
);
display: flex;
flex-direction: row;
align-items: flex-end;
justify-content: space-between;
gap: ${space(1)};
`;
2 changes: 1 addition & 1 deletion static/app/components/globalDrawer/components.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const DrawerContentContext = createContext<DrawerContentContextType>({
ariaLabel: 'slide out drawer',
});

function useDrawerContentContext() {
export function useDrawerContentContext() {
return useContext(DrawerContentContext);
}

Expand Down
4 changes: 4 additions & 0 deletions static/app/utils/analytics/featureFlagAnalyticsEvents.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@ export type FeatureFlagEventParameters = {
direction: 'next' | 'prev';
surface: 'settings' | 'flag_drawer';
};
'flags.setup_sidebar_opened': {
surface: 'issue_details.flags_section' | 'issue_details.flags_drawer';
};
'flags.sort_flags': {sortMethod: string};
'flags.table_rendered': {
numFlags: number;
Expand All @@ -31,4 +34,5 @@ export const featureFlagEventMap: Record<FeatureFlagEventKey, string | null> = {
'flags.cta_dismissed': 'Flag CTA Dismissed',
'flags.logs-paginated': 'Feature Flag Logs Paginated',
'flags.view-setup-sidebar': 'Viewed Feature Flag Onboarding Sidebar',
'flags.setup_sidebar_opened': 'Feature Flag Setup Sidebar Opened',
};
107 changes: 107 additions & 0 deletions static/app/views/issueDetails/groupFeatureFlags/flagDrawerCTA.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
import styled from '@emotion/styled';
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can any of this file & featureFlagInlineCTA.tsx be refactored into a reusable component?


import onboardingInstall from 'sentry-images/spot/onboarding-install.svg';

import {Button, LinkButton} from 'sentry/components/core/button';
import {useFeatureFlagOnboarding} from 'sentry/components/events/featureFlags/useFeatureFlagOnboarding';
import {useDrawerContentContext} from 'sentry/components/globalDrawer/components';
import {t} from 'sentry/locale';
import {space} from 'sentry/styles/space';
import {trackAnalytics} from 'sentry/utils/analytics';
import useOrganization from 'sentry/utils/useOrganization';

export default function FlagDrawerCTA() {
const organization = useOrganization();
const {activateSidebar} = useFeatureFlagOnboarding();
const {onClose: closeDrawer} = useDrawerContentContext();

function handleSetupButtonClick(e: any) {
trackAnalytics('flags.setup_sidebar_opened', {
organization,
surface: 'issue_details.flags_drawer',
});
trackAnalytics('flags.cta_setup_button_clicked', {organization});
closeDrawer?.();
setTimeout(() => {
// Wait for global drawer state to update
activateSidebar(e);
}, 100);
}

return (
<BannerWrapper>
<BannerContent>
<BannerTitle>{t('Set Up Feature Flags')}</BannerTitle>
<BannerDescription>
{t(
'Want to know which feature flags were associated with this issue? Set up your feature flag integration.'
)}
</BannerDescription>
<ActionButton>
<Button onClick={handleSetupButtonClick} priority="primary">
{t('Set Up Now')}
</Button>
<LinkButton
priority="default"
href="https://docs.sentry.io/product/explore/feature-flags/"
external
>
{t('Read More')}
</LinkButton>
</ActionButton>
</BannerContent>
<BannerIllustration src={onboardingInstall} alt="Install" />
</BannerWrapper>
);
}

const ActionButton = styled('div')`
display: flex;
gap: ${space(1)};
`;

const BannerTitle = styled('div')`
font-size: ${p => p.theme.fontSizeExtraLarge};
margin-bottom: ${space(1)};
font-weight: ${p => p.theme.fontWeightBold};
`;

const BannerDescription = styled('div')`
margin-bottom: ${space(1.5)};
max-width: 340px;
`;

const BannerContent = styled('div')`
padding: ${space(2)};

display: flex;
flex-direction: column;
justify-content: center;
`;

const BannerIllustration = styled('img')`
height: 100%;
object-fit: contain;
max-width: 30%;
margin-right: 10px;
margin-bottom: -${space(2)};
padding: ${space(2)};
`;

const BannerWrapper = styled('div')`
position: relative;
border: 1px solid ${p => p.theme.border};
border-radius: ${p => p.theme.borderRadius};
margin: ${space(1)} 0;
background: linear-gradient(
90deg,
${p => p.theme.backgroundSecondary}00 0%,
${p => p.theme.backgroundSecondary}FF 70%,
${p => p.theme.backgroundSecondary}FF 100%
);
display: flex;
flex-direction: row;
align-items: flex-end;
justify-content: space-between;
gap: ${space(1)};
`;
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,13 @@ import {useMemo} from 'react';

import LoadingError from 'sentry/components/loadingError';
import LoadingIndicator from 'sentry/components/loadingIndicator';
import {featureFlagOnboardingPlatforms} from 'sentry/data/platformCategories';
import {t} from 'sentry/locale';
import type {Group} from 'sentry/types/group';
import useOrganization from 'sentry/utils/useOrganization';
import useProjectFromSlug from 'sentry/utils/useProjectFromSlug';
import FlagDetailsLink from 'sentry/views/issueDetails/groupFeatureFlags/flagDetailsLink';
import FlagDrawerCTA from 'sentry/views/issueDetails/groupFeatureFlags/flagDrawerCTA';
import useGroupFeatureFlags from 'sentry/views/issueDetails/groupFeatureFlags/useGroupFeatureFlags';
import {
Container,
Expand Down Expand Up @@ -61,6 +65,18 @@ export default function GroupFeatureFlagsDrawerContent({
return searchedTags;
}, [data, search, tagValues]);

const organization = useOrganization();
const project = useProjectFromSlug({organization, projectSlug: group.project?.slug});
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

does simply group.project not work for project?

Suggested change
const project = useProjectFromSlug({organization, projectSlug: group.project?.slug});
const project = group.project;


if (
data.length === 0 &&
project &&
!project.hasFlags &&
featureFlagOnboardingPlatforms.includes(project.platform ?? 'other')
) {
return <FlagDrawerCTA />;
}

return isPending ? (
<LoadingIndicator />
) : isError ? (
Expand Down
Loading