Move noDataConfig new logic

elastic · Oct 16, 2024 · 3ee8a24 · 3ee8a24
1 parent a81193c
commit 3ee8a24
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 15 deletions.
diff --git a/...s/observability_solution/infra/public/components/shared/templates/infra_page_template.tsx b/...s/observability_solution/infra/public/components/shared/templates/infra_page_template.tsx
@@ -65,7 +65,9 @@ export const InfraPageTemplate = ({
   const hasLogsData = isLogsSignal(dataStreams);
   const noDataConfig = getNoDataConfig({
     hasData,
-    loading: isPending(status),
+    hasLogsData,
+    isEntityCentricExperienceEnabled,
+    loading: isPending(status) || isPending(entitySummaryStatus),
     onboardingFlow,
     docsLink: docLinks.links.observability.guide,
     locators: share.url.locators,
@@ -130,22 +132,10 @@ export const InfraPageTemplate = ({
     />;
   }
 
-  const evaluateNoDataConfig = () => {
-    if (entitySummaryStatus === 'failure') {
-      return noDataConfig;
-    }
-
-    if (entitySummaryStatus !== 'success') {
-      return undefined;
-    }
-
-    return isEntityCentricExperienceEnabled && hasLogsData ? undefined : noDataConfig;
-  };
-
   return (
     <PageTemplate
       data-test-subj={hasData ? _dataTestSubj : 'noDataPage'}
-      noDataConfig={evaluateNoDataConfig()}
+      noDataConfig={noDataConfig}
       {...pageTemplateProps}
     />
   );

diff --git a/...plugins/observability_solution/infra/public/components/shared/templates/no_data_config.ts b/...plugins/observability_solution/infra/public/components/shared/templates/no_data_config.ts
@@ -101,18 +101,22 @@ const getNoDataConfigDetails = ({
 
 export const getNoDataConfig = ({
   hasData,
+  hasLogsData,
   loading,
   locators,
   onboardingFlow,
   docsLink,
+  isEntityCentricExperienceEnabled,
 }: {
   hasData: boolean;
+  hasLogsData?: boolean;
   loading: boolean;
   onboardingFlow: OnboardingFlow;
   locators: LocatorClient;
   docsLink?: string;
+  isEntityCentricExperienceEnabled?: boolean;
 }): NoDataConfig | undefined => {
-  if (hasData || loading) {
+  if (hasData || loading || (isEntityCentricExperienceEnabled && hasLogsData)) {
     return;
   }