diff --git a/openmetadata-ui/src/main/resources/ui/src/components/BulkEditEntity/BulkEditEntity.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/BulkEditEntity/BulkEditEntity.component.tsx index 384f759786f..debeb9b18c8 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/BulkEditEntity/BulkEditEntity.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/BulkEditEntity/BulkEditEntity.component.tsx @@ -13,23 +13,20 @@ import ReactDataGrid from '@inovua/reactdatagrid-community'; import { Button, Col, Row } from 'antd'; import { isEmpty } from 'lodash'; -import React, { useEffect, useMemo } from 'react'; +import React, { useEffect } from 'react'; import { useTranslation } from 'react-i18next'; import { readString } from 'react-papaparse'; -import { useParams } from 'react-router-dom'; +import { useHistory, useParams } from 'react-router-dom'; import { ENTITY_BULK_EDIT_STEPS } from '../../constants/BulkEdit.constants'; import { ExportTypes } from '../../constants/Export.constants'; import { EntityType } from '../../enums/entity.enum'; import { useFqn } from '../../hooks/useFqn'; -import { - getBulkEditCSVExportEntityApi, - getBulkEntityEditBreadcrumbList, -} from '../../utils/EntityBulkEdit/EntityBulkEditUtils'; +import { getBulkEditCSVExportEntityApi } from '../../utils/EntityBulkEdit/EntityBulkEditUtils'; +import entityUtilClassBase from '../../utils/EntityUtilClassBase'; import Banner from '../common/Banner/Banner'; import { ImportStatus } from '../common/EntityImport/ImportStatus/ImportStatus.component'; import Loader from '../common/Loader/Loader'; import TitleBreadcrumb from '../common/TitleBreadcrumb/TitleBreadcrumb.component'; -import { TitleBreadcrumbProps } from '../common/TitleBreadcrumb/TitleBreadcrumb.interface'; import { useEntityExportModalProvider } from '../Entity/EntityExportModalProvider/EntityExportModalProvider.component'; import Stepper from '../Settings/Services/Ingestion/IngestionStepper/IngestionStepper.component'; import { BulkEditEntityProps } from './BulkEditEntity.interface'; @@ -41,6 +38,7 @@ const BulkEditEntity = ({ onEditComplete, dataSource, columns, + breadcrumbList, setGridRef, activeStep, handleBack, @@ -52,15 +50,16 @@ const BulkEditEntity = ({ onCSVReadComplete, }: BulkEditEntityProps) => { const { t } = useTranslation(); + const history = useHistory(); const { fqn } = useFqn(); const { entityType } = useParams<{ entityType: EntityType }>(); const { triggerExportForBulkEdit, csvExportData, clearCSVExportData } = useEntityExportModalProvider(); - const breadcrumbList: TitleBreadcrumbProps['titleLinks'] = useMemo( - () => getBulkEntityEditBreadcrumbList(entityType, fqn), - [entityType, fqn] - ); + const handleCancel = () => { + clearCSVExportData(); + history.push(entityUtilClassBase.getEntityLink(entityType, fqn)); + }; useEffect(() => { triggerExportForBulkEdit({ @@ -159,6 +158,12 @@ const BulkEditEntity = ({ {activeStep > 0 && (
+ {activeStep === 1 && ( + + )} + {activeStep > 1 && (