From 3bd22d757d5af1c4ce2691755d6a234c331638ec Mon Sep 17 00:00:00 2001
From: Thom Heymann <thom.heymann@elastic.co>
Date: Tue, 26 Mar 2024 16:25:13 +0000
Subject: [PATCH 1/2] Update add data links in infra plugin

---
 .../infra/public/pages/logs/page_content.tsx       | 12 ++++++++++--
 .../infra/public/pages/metrics/index.tsx           | 14 ++++++++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/x-pack/plugins/observability_solution/infra/public/pages/logs/page_content.tsx b/x-pack/plugins/observability_solution/infra/public/pages/logs/page_content.tsx
index 99de8fc23b5c0..f398b32501d04 100644
--- a/x-pack/plugins/observability_solution/infra/public/pages/logs/page_content.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/pages/logs/page_content.tsx
@@ -81,7 +81,7 @@ export const LogsPageContent: React.FunctionComponent = () => {
                 </EuiHeaderLink>
                 <LazyAlertDropdownWrapper />
                 <EuiHeaderLink
-                  href={getUrlForApp('/integrations/browse')}
+                  href={getUrlForApp('/observabilityOnboarding')}
                   color="primary"
                   iconType="indexOpen"
                 >
@@ -104,7 +104,15 @@ export const LogsPageContent: React.FunctionComponent = () => {
         <RedirectWithQueryParams from={'/analysis'} to={anomaliesTab.pathname} exact />
         <RedirectWithQueryParams from={'/log-rate'} to={anomaliesTab.pathname} exact />
         <RedirectWithQueryParams from={'/'} to={streamTab.pathname} exact />
-        <Route render={() => <NotFoundPage title="Logs" />} />
+        <Route
+          render={() => (
+            <NotFoundPage
+              title={i18n.translate('xpack.infra.logs.index.logsLabel', {
+                defaultMessage: 'Logs',
+              })}
+            />
+          )}
+        />
       </Routes>
     </>
   );
diff --git a/x-pack/plugins/observability_solution/infra/public/pages/metrics/index.tsx b/x-pack/plugins/observability_solution/infra/public/pages/metrics/index.tsx
index 494ad94830abe..d87706a587b8b 100644
--- a/x-pack/plugins/observability_solution/infra/public/pages/metrics/index.tsx
+++ b/x-pack/plugins/observability_solution/infra/public/pages/metrics/index.tsx
@@ -103,7 +103,9 @@ export const InfrastructurePage = () => {
                         <MetricsAlertDropdown />
                       )}
                       <EuiHeaderLink
-                        href={kibana.services?.application?.getUrlForApp('/integrations/browse')}
+                        href={kibana.services?.application?.getUrlForApp(
+                          '/observabilityOnboarding'
+                        )}
                         color="primary"
                         iconType="indexOpen"
                       >
@@ -144,7 +146,15 @@ export const InfrastructurePage = () => {
               <RedirectWithQueryParams from="/metrics-explorer" exact to="/explorer" />
               <RedirectWithQueryParams from="/" exact to="/inventory" />
 
-              <Route render={() => <NotFoundPage title="Infrastructure" />} />
+              <Route
+                render={() => (
+                  <NotFoundPage
+                    title={i18n.translate('xpack.infra.header.infrastructureLabel', {
+                      defaultMessage: 'Infrastructure',
+                    })}
+                  />
+                )}
+              />
             </Routes>
           </InfraMLCapabilitiesProvider>
         </AlertPrefillProvider>

From 34bc85d0e164df6b33f67828d402fb202ed45285 Mon Sep 17 00:00:00 2001
From: Thom Heymann <thom.heymann@elastic.co>
Date: Tue, 26 Mar 2024 17:32:23 +0000
Subject: [PATCH 2/2] Fix selection bug caused by too generic ids

---
 .../onboarding_flow_form/onboarding_flow_form.tsx            | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/x-pack/plugins/observability_solution/observability_onboarding/public/application/onboarding_flow_form/onboarding_flow_form.tsx b/x-pack/plugins/observability_solution/observability_onboarding/public/application/onboarding_flow_form/onboarding_flow_form.tsx
index 396d3280ca47f..0beca82dbd1e0 100644
--- a/x-pack/plugins/observability_solution/observability_onboarding/public/application/onboarding_flow_form/onboarding_flow_form.tsx
+++ b/x-pack/plugins/observability_solution/observability_onboarding/public/application/onboarding_flow_form/onboarding_flow_form.tsx
@@ -21,6 +21,7 @@ import {
   EuiFlexGrid,
   EuiAvatar,
   useEuiTheme,
+  useGeneratedHtmlId,
 } from '@elastic/eui';
 
 interface UseCaseOption {
@@ -159,6 +160,7 @@ export const OnboardingFlowForm: FunctionComponent = () => {
     },
   ];
 
+  const radioGroupId = useGeneratedHtmlId({ prefix: 'onboardingUseCase' });
   const [selectedId, setSelectedId] = useState<string>();
   const [hoveredId, setHoveredId] = useState<string>();
 
@@ -194,7 +196,8 @@ export const OnboardingFlowForm: FunctionComponent = () => {
               {/* Using EuiSpacer instead of EuiFlexGroup to ensure spacing is part of hit area for mouse hover effect */}
               {index > 0 && <EuiSpacer size="m" />}
               <EuiCheckableCard
-                id={option.id}
+                id={`${radioGroupId}_${option.id}`}
+                name={radioGroupId}
                 label={option.label}
                 checked={selectedId === option.id}
                 onChange={() => setSelectedId(option.id)}