Skip to content

Commit

Permalink
PMM-12545 restore warning and remove comments
Browse files Browse the repository at this point in the history
  • Loading branch information
YashSartanpara1 committed Dec 5, 2023
1 parent 05ad933 commit d209614
Show file tree
Hide file tree
Showing 6 changed files with 45 additions and 20 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import { ConnectRenderProps } from '../types';

import { getStyles } from './Connect.styles';
import { ConnectProps } from './Connect.types';
import { PMMServerUrlWarning } from './PMMServerURLWarning/PMMServerUrlWarning';

export const Connect: FC<ConnectProps> = ({ onConnect, connecting, initialValues }) => {
const styles = useStyles2(getStyles);
Expand Down Expand Up @@ -64,7 +65,7 @@ export const Connect: FC<ConnectProps> = ({ onConnect, connecting, initialValues
</Button>
</a>
</div>
{/* {showPMMAddressWarning && <PMMServerUrlWarning />} */}
{showPMMAddressWarning && <PMMServerUrlWarning />}
<LoaderButton
data-testid="connect-button"
type="submit"
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
export const Messages = {
heading: 'PMM Public Address',
addressSet: (address: string) => `This will also set "Public Address" as ${address}. `,
editLater: 'If you need to set it differently or edit later, use ',
advancedSettings: 'Advanced Settings',
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import { css } from '@emotion/css';

import { GrafanaTheme } from '@grafana/data';

export const getStyles = ({ spacing }: GrafanaTheme) => ({
alert: css`
p {
margin-bottom: 0;
}
margin: ${spacing.md} 0;
`,
});
Original file line number Diff line number Diff line change
@@ -0,0 +1,22 @@
import { cx } from '@emotion/css';
import React, { FC } from 'react';
import { Link } from 'react-router-dom';

import { Card, useStyles } from '@grafana/ui';

import { Messages } from './PMMServerUrlWarning.messages';
import { getStyles } from './PMMServerUrlWarning.styles';

export const PMMServerUrlWarning: FC<PMMServerUrlWarningProps> = ({ className }) => {
const styles = useStyles(getStyles);
return (
<Card className={cx(styles.alert, className)} data-testid="pmm-server-url-warning">
<Card.Heading>{Messages.heading}</Card.Heading>
<Card.Description>
{Messages.addressSet(window.location.host)}
{Messages.editLater}
<Link to="/settings/advanced-settings">{Messages.advancedSettings}</Link>.
</Card.Description>
</Card>
);
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
interface PMMServerUrlWarningProps {
className?: string;
}
19 changes: 0 additions & 19 deletions public/app/percona/tour/steps/product/product.steps.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -87,25 +87,6 @@ export const getProductTourSteps = (
},
]
: []),
// ...(isPmmAdmin && !!settings?.dbaasEnabled
// ? [
// {
// selector: '.dropdown > [aria-label="DBaaS"]',
// content: (
// <SidebarStep title={Messages.dbaas.title}>
// <p>{Messages.dbaas.feature}</p>
// <p>{Messages.dbaas.techPreview}</p>
// <p>{Messages.dbaas.benefits}</p>
// <ul>
// <li>{Messages.dbaas.singleInterface}</li>
// <li>{Messages.dbaas.dbManagement}</li>
// <li>{Messages.dbaas.automation}</li>
// </ul>
// </SidebarStep>
// ),
// },
// ]
// : []),
...(isPmmAdmin && !!settings?.backupEnabled
? [
{
Expand Down

0 comments on commit d209614

Please sign in to comment.