fix: update logic to handle step paths in Kubernetes APM flow (#4297)

* fix: update logic to handle step paths in kubernetes APM flow

* fix: don't reset service name on data source component mount
This commit is contained in:
Yunus M 2023-12-28 18:30:41 +05:30 committed by GitHub
parent fbbe0bef86
commit a268bb910c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 15 deletions

View File

@ -35,9 +35,7 @@ export default function DataSource(): JSX.Element {
selectedFramework, selectedFramework,
updateSelectedDataSource, updateSelectedDataSource,
updateServiceName, updateServiceName,
updateSelectedEnvironment,
updateSelectedFramework, updateSelectedFramework,
updateErrorDetails,
} = useOnboardingContext(); } = useOnboardingContext();
const [supportedDataSources, setSupportedDataSources] = useState< const [supportedDataSources, setSupportedDataSources] = useState<
@ -55,11 +53,6 @@ export default function DataSource(): JSX.Element {
setSupportedDataSources(dataSource); setSupportedDataSources(dataSource);
} }
updateSelectedEnvironment('');
updateErrorDetails('');
updateServiceName('');
updateSelectedFramework('');
// eslint-disable-next-line react-hooks/exhaustive-deps // eslint-disable-next-line react-hooks/exhaustive-deps
}, []); }, []);

View File

@ -3,7 +3,10 @@ import { MarkdownRenderer } from 'components/MarkdownRenderer/MarkdownRenderer';
import { ApmDocFilePaths } from 'container/OnboardingContainer/constants/apmDocFilePaths'; import { ApmDocFilePaths } from 'container/OnboardingContainer/constants/apmDocFilePaths';
import { InfraMonitoringDocFilePaths } from 'container/OnboardingContainer/constants/infraMonitoringDocFilePaths'; import { InfraMonitoringDocFilePaths } from 'container/OnboardingContainer/constants/infraMonitoringDocFilePaths';
import { LogsManagementDocFilePaths } from 'container/OnboardingContainer/constants/logsManagementDocFilePaths'; import { LogsManagementDocFilePaths } from 'container/OnboardingContainer/constants/logsManagementDocFilePaths';
import { useOnboardingContext } from 'container/OnboardingContainer/context/OnboardingContext'; import {
OnboardingMethods,
useOnboardingContext,
} from 'container/OnboardingContainer/context/OnboardingContext';
import { ModulesMap } from 'container/OnboardingContainer/OnboardingContainer'; import { ModulesMap } from 'container/OnboardingContainer/OnboardingContainer';
import useAnalytics from 'hooks/analytics/useAnalytics'; import useAnalytics from 'hooks/analytics/useAnalytics';
import { useEffect, useState } from 'react'; import { useEffect, useState } from 'react';
@ -42,12 +45,12 @@ export default function MarkdownStep(): JSX.Element {
path += `_${selectedEnvironment}`; path += `_${selectedEnvironment}`;
} }
if ( if (selectedModule?.id === ModulesMap.APM) {
selectedModule?.id === ModulesMap.APM && if (selectedEnvironment === 'kubernetes') {
selectedDataSource?.id !== 'kubernetes' && path += `_${OnboardingMethods.RECOMMENDED_STEPS}`;
selectedMethod } else if (selectedEnvironment !== 'kubernetes' && selectedMethod) {
) { path += `_${selectedMethod}`;
path += `_${selectedMethod}`; }
} }
path += `_${step?.id}`; path += `_${step?.id}`;

View File

@ -104,7 +104,7 @@ function OnboardingContextProvider({
setSelectedDataSource(defaultApplicationDataSource); setSelectedDataSource(defaultApplicationDataSource);
setSelectedEnvironment(''); setSelectedEnvironment('');
setSelectedFramework(''); setSelectedFramework('');
setSelectedMethod(OnboardingMethods.RECOMMENDED_STEPS); setSelectedMethod(OnboardingMethods.QUICK_START);
updateActiveStep(null); updateActiveStep(null);
}; };