Skip to content

Updated App notification #20254

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 3 commits into from
Oct 1, 2024
Merged

Updated App notification #20254

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ea078be
New App notification
Siddhant-K-code Sep 30, 2024
917433b
Introduce `<GITPOD_FLEX_INTRODUCTION>`
filiptronicek Oct 1, 2024
141e29a
Update Copy for App Notification
Siddhant-K-code Oct 1, 2024
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
48 changes: 48 additions & 0 deletions components/dashboard/src/AppNotifications.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,50 @@ const UPDATED_PRIVACY_POLICY = (updateUser: (user: Partial<UserProtocol>) => Pro
} as Notification;
};

const GITPOD_FLEX_INTRODUCTION_COACHMARK_KEY = "gitpod_flex_introduction";
const GITPOD_FLEX_INTRODUCTION = (updateUser: (user: Partial<UserProtocol>) => Promise<User>) => {
return {
id: GITPOD_FLEX_INTRODUCTION_COACHMARK_KEY,
type: "info",
preventDismiss: true,
onClose: async () => {
let dismissSuccess = false;
try {
const updatedUser = await updateUser({
additionalData: {
profile: {
coachmarksDismissals: {
[GITPOD_FLEX_INTRODUCTION_COACHMARK_KEY]: new Date().toISOString(),
},
},
},
});
dismissSuccess = !!updatedUser;
} catch (err) {
dismissSuccess = false;
} finally {
trackEvent("coachmark_dismissed", {
name: "gitpod-flex-introduction",
success: dismissSuccess,
});
}
},
message: (
<span className="text-md">
<b>Introducing Gitpod Flex:</b> self-host for free in 3 min or run locally using Gitpod Desktop |{" "}
<a
className="text-kumquat-ripe font-bold"
href="https://app.gitpod.io"
target="_blank"
rel="noreferrer"
>
Try now
</a>
</span>
),
} as Notification;
};

const INVALID_BILLING_ADDRESS = (stripePortalUrl: string | undefined) => {
return {
id: "invalid-billing-address",
Expand Down Expand Up @@ -115,6 +159,10 @@ export function AppNotifications() {
notifications.push(notification);
}
}

if (isGitpodIo() && !user?.profile?.coachmarksDismissals[GITPOD_FLEX_INTRODUCTION_COACHMARK_KEY]) {
notifications.push(GITPOD_FLEX_INTRODUCTION((u: Partial<UserProtocol>) => mutateAsync(u)));
}
}

if (!ignore) {
Expand Down
2 changes: 1 addition & 1 deletion components/dashboard/src/components/Alert.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ const infoMap: Record<AlertType, AlertInfo> = {
bgCls: "bg-gray-100 dark:bg-gray-700",
txtCls: "text-gray-500 dark:text-gray-300",
icon: <InfoSvg className="w-4 h-4"></InfoSvg>,
iconColor: "text-gray-400",
iconColor: "text-gray-400 dark:text-gray-300",
},
message: {
bgCls: "bg-blue-50 dark:bg-blue-800",
Expand Down
Loading