Skip to content

#RI-4939, #RI-4934 #2608

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 2 commits into from
Sep 22, 2023
Merged

#RI-4939, #RI-4934 #2608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4781480
#RI-4939 - [Regression][FE] CREATE_FREE_CLOUD_DATABASE_CLICKED event …
egor-zalenski Sep 20, 2023
1b04895
#RI-4934 - [FE] Add more information to the provider selection step
egor-zalenski Sep 20, 2023
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
9 changes: 5 additions & 4 deletions redisinsight/ui/src/components/oauth/oauth-select-plan/OAuthSelectPlan.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,12 +158,13 @@ const OAuthSelectPlan = () => {
<EuiModal className={styles.container} onClose={handleOnClose} data-testid="oauth-select-plan-dialog">
<EuiModalBody className={styles.modalBody}>
<section className={styles.content}>
<EuiText className={styles.subTitle}>
Redis Enterprise Cloud
</EuiText>
<EuiTitle size="s">
<h2 className={styles.title}>Select cloud vendor</h2>
<h2 className={styles.title}>Choose a cloud vendor</h2>
</EuiTitle>
<EuiText className={styles.subTitle}>
Select a cloud vendor and region to complete the final step towards
your free Redis database. No credit card is required.
</EuiText>
<section className={styles.providers}>
{ OAuthProviders.map(({ icon, id, label }) => (
<div className={styles.provider} key={id}>
Expand Down
4 changes: 2 additions & 2 deletions redisinsight/ui/src/components/oauth/oauth-select-plan/styles.module.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,11 @@
.title {
font-size: 28px !important;
color: var(--htmlColor) !important;
padding-top: 16px;
}

.subTitle {
padding-top: 24px;
padding-bottom: 8px;
padding: 24px 40px 0;
font-size: 14px !important;
}

Expand Down
7 changes: 5 additions & 2 deletions redisinsight/ui/src/components/oauth/oauth-sso-handler-dialog/OAuthSsoHandlerDialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,10 @@ import { appFeatureFlagsFeaturesSelector } from 'uiSrc/slices/app/features'
import { setSignInDialogState } from 'uiSrc/slices/oauth/cloud'

export interface Props {
children: (ssoCloudHandlerClick: (e: React.MouseEvent, source: OAuthSocialSource) => void) => React.ReactElement
children: (
ssoCloudHandlerClick: (e: React.MouseEvent, source: OAuthSocialSource) => void,
isSSOEnabled: boolean,
) => React.ReactElement
}

const OAuthSsoHandlerDialog = ({ children }: Props) => {
Expand All @@ -32,7 +35,7 @@ const OAuthSsoHandlerDialog = ({ children }: Props) => {
})
}

return children?.(ssoCloudHandlerClick)
return children?.(ssoCloudHandlerClick, !!feature?.flag)
}

export default OAuthSsoHandlerDialog
7 changes: 5 additions & 2 deletions redisinsight/ui/src/pages/home/components/HomeHeader/HomeHeader.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ const HomeHeader = ({ onAddInstance, direction }: Props) => {
const linkStyles = stylesCss ? stylesCss[theme] : {}
const promoLink = (
<OAuthSsoHandlerDialog>
{(ssoCloudHandlerClick) => (
{(ssoCloudHandlerClick, isSSOEnabled) => (
<PromoLink
title={title}
description={description}
Expand All @@ -199,7 +199,10 @@ const HomeHeader = ({ onAddInstance, direction }: Props) => {
: undefined
}}
onClick={(e) => {
handleCreateDatabaseClick(HELP_LINKS.cloud.event, { source: 'My Redis databases' })
!isSSOEnabled && handleCreateDatabaseClick(
HELP_LINKS.cloud.event,
{ source: HELP_LINKS.cloud.sources.databaseList },
)
ssoCloudHandlerClick(e, OAuthSocialSource.ListOfDatabases)
}}
/>
Expand Down