diff --git a/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Suggestions.tsx b/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Suggestions.tsx index 6e746725015..64d58b8375f 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Suggestions.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/AppBar/Suggestions.tsx @@ -44,6 +44,7 @@ import { TagSource, TopicSource, } from '../GlobalSearchProvider/GlobalSearchSuggestions/GlobalSearchSuggestions.interface'; +import { useTourProvider } from '../TourProvider/TourProvider'; type SuggestionProp = { searchText: string; @@ -58,6 +59,7 @@ const Suggestions = ({ searchCriteria, }: SuggestionProp) => { const { t } = useTranslation(); + const { isTourOpen } = useTourProvider(); const [isLoading, setIsLoading] = useState(true); const [options, setOptions] = useState>([]); const [tableSuggestions, setTableSuggestions] = useState([]); @@ -210,8 +212,10 @@ const Suggestions = ({ }, [searchText, searchCriteria]); useEffect(() => { - if (!isMounting.current && searchText) { + if (!isMounting.current && searchText && !isTourOpen) { fetchSearchData(); + } else { + setIsLoading(false); } }, [searchText, searchCriteria]); @@ -224,7 +228,7 @@ const Suggestions = ({ return ; } - if (options.length === 0) { + if (options.length === 0 && !isTourOpen) { return ( = ({ csvImportResult }) => { data-testid="status-container" // Added max width because in case of full success we don't want to occupied full width style={{ maxWidth: 200 }}> - {status === Status.Success && ( - - )} - {status === Status.Failure && ( + {status === Status.Failure ? ( <> = ({ csvImportResult }) => { /> {record.details} + ) : ( + )} ); @@ -201,10 +201,9 @@ export const GlossaryImportResult: FC = ({ csvImportResult }) => { (value) => ({ ...value, key: value['name*'], - status: - value['details'] === 'Entity created' - ? Status.Success - : Status.Failure, + status: GLOSSARY_IMPORT_STATUS.includes(value['details'] ?? '') + ? Status.Success + : Status.Failure, }) ) ); diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Modals/TourEndModal/TourEndModal.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Modals/TourEndModal/TourEndModal.tsx index eb2395428a8..bf2b01f1c03 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Modals/TourEndModal/TourEndModal.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Modals/TourEndModal/TourEndModal.tsx @@ -37,6 +37,7 @@ const TourEndModal = ({ onSave, visible }: TourEndModalProps) => { diff --git a/openmetadata-ui/src/main/resources/ui/src/components/tour/Tour.tsx b/openmetadata-ui/src/main/resources/ui/src/components/tour/Tour.tsx index 0e9376da273..48a5175572c 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/tour/Tour.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/tour/Tour.tsx @@ -47,18 +47,22 @@ const Tour = ({ steps }: { steps: TourSteps[] }) => { accentColor={PRIMERY_COLOR} inViewThreshold={200} lastStepNextButton={ - +