From d209614cb248f84f8a1a3151bc1359b454500c3c Mon Sep 17 00:00:00 2001
From: Yash Sartanpara <yash.sartanpara@3pillarglobal.com>
Date: Tue, 5 Dec 2023 15:51:15 +0530
Subject: [PATCH] PMM-12545 restore warning and remove comments

---
 .../components/Platform/Connect/Connect.tsx   |  3 ++-
 .../PMMServerUrlWarning.messages.ts           |  6 +++++
 .../PMMServerUrlWarning.styles.ts             | 12 ++++++++++
 .../PMMServerUrlWarning.tsx                   | 22 +++++++++++++++++++
 .../PMMServerUrlWarning.types.ts              |  3 +++
 .../tour/steps/product/product.steps.tsx      | 19 ----------------
 6 files changed, 45 insertions(+), 20 deletions(-)
 create mode 100644 public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.messages.ts
 create mode 100644 public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.styles.ts
 create mode 100644 public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.tsx
 create mode 100644 public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.types.ts

diff --git a/public/app/percona/settings/components/Platform/Connect/Connect.tsx b/public/app/percona/settings/components/Platform/Connect/Connect.tsx
index c54abd033505..01f577c468bd 100644
--- a/public/app/percona/settings/components/Platform/Connect/Connect.tsx
+++ b/public/app/percona/settings/components/Platform/Connect/Connect.tsx
@@ -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);
@@ -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"
diff --git a/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.messages.ts b/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.messages.ts
new file mode 100644
index 000000000000..cf082225c4b6
--- /dev/null
+++ b/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.messages.ts
@@ -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',
+};
diff --git a/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.styles.ts b/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.styles.ts
new file mode 100644
index 000000000000..3fef5af4c994
--- /dev/null
+++ b/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.styles.ts
@@ -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;
+  `,
+});
diff --git a/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.tsx b/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.tsx
new file mode 100644
index 000000000000..8f053886b9d4
--- /dev/null
+++ b/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.tsx
@@ -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>
+  );
+};
diff --git a/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.types.ts b/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.types.ts
new file mode 100644
index 000000000000..e5126f8a52ac
--- /dev/null
+++ b/public/app/percona/settings/components/Platform/Connect/PMMServerURLWarning/PMMServerUrlWarning.types.ts
@@ -0,0 +1,3 @@
+interface PMMServerUrlWarningProps {
+  className?: string;
+}
diff --git a/public/app/percona/tour/steps/product/product.steps.tsx b/public/app/percona/tour/steps/product/product.steps.tsx
index 679b357c79e1..5e158155a98d 100644
--- a/public/app/percona/tour/steps/product/product.steps.tsx
+++ b/public/app/percona/tour/steps/product/product.steps.tsx
@@ -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
     ? [
         {