From 1498afdf2a61b143321dcc19d4f358f9f5bd371d Mon Sep 17 00:00:00 2001
From: "grafana-delivery-bot[bot]"
 <132647405+grafana-delivery-bot[bot]@users.noreply.github.com>
Date: Mon, 7 Aug 2023 11:45:37 +0200
Subject: [PATCH] [v10.1.x] Admin: Add redirect notice for datasources to admin
 landing page (#72865)

Admin: Add redirect notice for datasources to admin landing page (#72736)

* update copy of ConnectionsRedirectNotice

The Connections page is not that new anymore

* extend NavLandingPage with optional header

* show ConnectionsRedirectNotice on Admin landing page

* make ConnectionsRedirectNotice dismissable

* make ConnectionsRedirectNotice informational

(cherry picked from commit 290fc3aadf4400f224bd028806ad2e3975a19531)

Co-authored-by: mikkancso <miklos.tolnai@grafana.com>
---
 .../components/NavLandingPage/NavLandingPage.test.tsx | 10 ++++++++--
 .../core/components/NavLandingPage/NavLandingPage.tsx |  4 +++-
 .../ConnectionsRedirectNotice.tsx                     | 11 +++++++----
 public/app/routes/routes.tsx                          |  3 ++-
 4 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/public/app/core/components/NavLandingPage/NavLandingPage.test.tsx b/public/app/core/components/NavLandingPage/NavLandingPage.test.tsx
index f327f0b1463..61ffd5a0fd9 100644
--- a/public/app/core/components/NavLandingPage/NavLandingPage.test.tsx
+++ b/public/app/core/components/NavLandingPage/NavLandingPage.test.tsx
@@ -39,7 +39,7 @@ describe('NavLandingPage', () => {
     ],
   };
 
-  const setup = () => {
+  const setup = (showHeader = false) => {
     config.bootData.navTree = [
       {
         text: mockSectionTitle,
@@ -50,9 +50,10 @@ describe('NavLandingPage', () => {
       },
     ];
 
+    const header = showHeader ? <h3>Custom Header</h3> : undefined;
     return render(
       <TestProvider>
-        <NavLandingPage navId={mockId} />
+        <NavLandingPage navId={mockId} header={header} />
       </TestProvider>
     );
   };
@@ -78,4 +79,9 @@ describe('NavLandingPage', () => {
     expect(screen.getByText(mockChild1.subTitle)).toBeInTheDocument();
     expect(screen.getByText(mockChild2.subTitle)).toBeInTheDocument();
   });
+
+  it('renders the custom header when supplied', () => {
+    setup(true);
+    expect(screen.getByRole('heading', { name: 'Custom Header' })).toBeInTheDocument();
+  });
 });
diff --git a/public/app/core/components/NavLandingPage/NavLandingPage.tsx b/public/app/core/components/NavLandingPage/NavLandingPage.tsx
index 75a069b5bb9..9be82d67c7a 100644
--- a/public/app/core/components/NavLandingPage/NavLandingPage.tsx
+++ b/public/app/core/components/NavLandingPage/NavLandingPage.tsx
@@ -10,9 +10,10 @@ import { NavLandingPageCard } from './NavLandingPageCard';
 
 interface Props {
   navId: string;
+  header?: React.ReactNode;
 }
 
-export function NavLandingPage({ navId }: Props) {
+export function NavLandingPage({ navId, header }: Props) {
   const { node } = useNavModel(navId);
   const styles = useStyles2(getStyles);
   const children = node.children?.filter((child) => !child.hideFromTabs);
@@ -21,6 +22,7 @@ export function NavLandingPage({ navId }: Props) {
     <Page navId={node.id}>
       <Page.Contents>
         <div className={styles.content}>
+          {header}
           {children && children.length > 0 && (
             <section className={styles.grid}>
               {children?.map((child) => (
diff --git a/public/app/features/connections/components/ConnectionsRedirectNotice/ConnectionsRedirectNotice.tsx b/public/app/features/connections/components/ConnectionsRedirectNotice/ConnectionsRedirectNotice.tsx
index f6567a77d7a..fc49117c918 100644
--- a/public/app/features/connections/components/ConnectionsRedirectNotice/ConnectionsRedirectNotice.tsx
+++ b/public/app/features/connections/components/ConnectionsRedirectNotice/ConnectionsRedirectNotice.tsx
@@ -1,5 +1,5 @@
 import { css } from '@emotion/css';
-import React from 'react';
+import React, { useState } from 'react';
 
 import { GrafanaTheme2 } from '@grafana/data';
 import { Alert, LinkButton, useStyles2 } from '@grafana/ui';
@@ -22,12 +22,13 @@ const getStyles = (theme: GrafanaTheme2) => ({
 
 export function ConnectionsRedirectNotice() {
   const styles = useStyles2(getStyles);
+  const [showNotice, setShowNotice] = useState(true);
 
-  return (
-    <Alert severity="warning" title="">
+  return showNotice ? (
+    <Alert severity="info" title="" onRemove={() => setShowNotice(false)}>
       <div className={styles.alertContent}>
         <p className={styles.alertParagraph}>
-          Data sources have a new home! You can discover new data sources or manage existing ones in the new Connections
+          Data sources have a new home! You can discover new data sources or manage existing ones in the Connections
           page, accessible from the main menu.
         </p>
         <LinkButton aria-label="Link to Connections" icon="arrow-right" href={ROUTES.DataSources} fill="text">
@@ -35,5 +36,7 @@ export function ConnectionsRedirectNotice() {
         </LinkButton>
       </div>
     </Alert>
+  ) : (
+    <></>
   );
 }
diff --git a/public/app/routes/routes.tsx b/public/app/routes/routes.tsx
index 16f202022ea..eb56b5d3d41 100644
--- a/public/app/routes/routes.tsx
+++ b/public/app/routes/routes.tsx
@@ -10,6 +10,7 @@ import { contextSrv } from 'app/core/services/context_srv';
 import UserAdminPage from 'app/features/admin/UserAdminPage';
 import LdapPage from 'app/features/admin/ldap/LdapPage';
 import { getAlertingRoutes } from 'app/features/alerting/routes';
+import { ConnectionsRedirectNotice } from 'app/features/connections/components/ConnectionsRedirectNotice';
 import { ROUTES as CONNECTIONS_ROUTES } from 'app/features/connections/constants';
 import { getRoutes as getDataConnectionsRoutes } from 'app/features/connections/routes';
 import { DATASOURCES_ROUTES } from 'app/features/datasources/constants';
@@ -309,7 +310,7 @@ export function getAppRoutes(): RouteDescriptor[] {
     },
     {
       path: '/admin',
-      component: () => <NavLandingPage navId="cfg" />,
+      component: () => <NavLandingPage navId="cfg" header={<ConnectionsRedirectNotice />} />,
     },
     {
       path: '/admin/access',