finish code

elastic · Oct 16, 2024 · 5e294bd · 5e294bd
1 parent 30ef626
commit 5e294bd
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 16 deletions.
diff --git a/...es/kbn-elastic-assistant/impl/knowledge_base/knowledge_base_settings_management/index.tsx b/...es/kbn-elastic-assistant/impl/knowledge_base/knowledge_base_settings_management/index.tsx
@@ -30,6 +30,7 @@ import {
 } from '@kbn/elastic-assistant-common';
 import { css } from '@emotion/react';
 import { DataViewsContract } from '@kbn/data-views-plugin/public';
+import { KnowledgeBaseTour } from '../../tour/knowledge_base';
 import { AlertsSettingsManagement } from '../../assistant/settings/alerts_settings/alerts_settings_management';
 import { useKnowledgeBaseEntries } from '../../assistant/api/knowledge_base/entries/use_knowledge_base_entries';
 import { useAssistantContext } from '../../assistant_context';
@@ -295,7 +296,6 @@ export const KnowledgeBaseSettingsManagement: React.FC<Params> = React.memo(({ d
       </>
     );
   }
-  // TODO tour step 2 here
   return (
     <>
       <EuiPanel hasShadow={false} hasBorder paddingSize="l">
@@ -412,6 +412,7 @@ export const KnowledgeBaseSettingsManagement: React.FC<Params> = React.memo(({ d
           <p>{i18n.DELETE_ENTRY_CONFIRMATION_CONTENT}</p>
         </EuiConfirmModal>
       )}
+      <KnowledgeBaseTour isKbSettingsPage />
     </>
   );
 });

diff --git a/x-pack/packages/kbn-elastic-assistant/impl/tour/knowledge_base/index.tsx b/x-pack/packages/kbn-elastic-assistant/impl/tour/knowledge_base/index.tsx
@@ -11,7 +11,7 @@
  * */
 
 import React, { useCallback, useEffect, useMemo, useState } from 'react';
-import { EuiButton, EuiButtonEmpty, EuiTourStep } from '@elastic/eui';
+import { EuiButton, EuiButtonEmpty, EuiTourStep, EuiTourStepProps } from '@elastic/eui';
 import useLocalStorage from 'react-use/lib/useLocalStorage';
 import { KNOWLEDGE_BASE_TAB } from '../../assistant/settings/const';
 import { useAssistantContext } from '../../..';
@@ -24,7 +24,10 @@ interface TourState {
   currentTourStep: number;
   isTourActive: boolean;
 }
-const KnowledgeBaseTourComp: React.FC<{ children?: React.ReactNode }> = ({ children }) => {
+const KnowledgeBaseTourComp: React.FC<{
+  children?: EuiTourStepProps['children'];
+  isKbSettingsPage: boolean;
+}> = ({ children, isKbSettingsPage = false }) => {
   const {
     navigateToApp,
     assistantFeatures: { assistantKnowledgeBaseByDefault: enableKnowledgeBaseByDefault },
@@ -34,7 +37,6 @@ const KnowledgeBaseTourComp: React.FC<{ children?: React.ReactNode }> = ({ child
     NEW_FEATURES_TOUR_STORAGE_KEYS.KNOWLEDGE_BASE,
     tourConfig
   );
-  const pageName = 'TODO';
 
   const advanceToVideoStep = useCallback(
     () =>
@@ -46,10 +48,10 @@ const KnowledgeBaseTourComp: React.FC<{ children?: React.ReactNode }> = ({ child
   );
 
   useEffect(() => {
-    if (tourState?.isTourActive && pageName === 'SecurityPageName.knowledgeBase') {
+    if (tourState?.isTourActive && isKbSettingsPage) {
       advanceToVideoStep();
     }
-  }, [advanceToVideoStep, tourState?.isTourActive]);
+  }, [advanceToVideoStep, isKbSettingsPage, tourState?.isTourActive]);
 
   const finishTour = useCallback(
     () =>
@@ -93,14 +95,6 @@ const KnowledgeBaseTourComp: React.FC<{ children?: React.ReactNode }> = ({ child
     // @ts-ignore
     window.Cypress != null || // TODO: temporary workaround to disable the tour when running in Cypress, because the tour breaks other projects Cypress tests
     navigator.webdriver === true; // TODO: temporary workaround to disable the tour when running in the FTR, because the tour breaks other projects FTR tests
-  console.log('tour conditions', {
-    con: !enableKnowledgeBaseByDefault || isTestAutomation || !tourState?.isTourActive,
-    con1: !enableKnowledgeBaseByDefault,
-    con2: isTestAutomation,
-    con3: !tourState?.isTourActive,
-    tourState,
-    children,
-  });
 
   const [isTimerExhausted, setIsTimerExhausted] = useState(false);
 
@@ -127,14 +121,13 @@ const KnowledgeBaseTourComp: React.FC<{ children?: React.ReactNode }> = ({ child
       panelProps={{
         'data-test-subj': `knowledgeBase-tour-step-1`,
       }}
-      // repositionOnScroll
       step={1}
       stepsTotal={1}
       title={knowledgeBaseTourStepOne.title}
     >
       {children}
     </EuiTourStep>
-  ) : pageName === 'SecurityPageName.knowledgeBase' ? (
+  ) : isKbSettingsPage ? (
     <VideoToast onClose={finishTour} />
   ) : (
     children ?? null