Skip to content

refactor(lineage): replace MUI Drawer and antd Modal with ui-core-components #29758

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
chirag-madlani wants to merge 6 commits into
base: main
Choose a base branch
from
+61 −36
Open

refactor(lineage): replace MUI Drawer and antd Modal with ui-core-components #29758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d0b326d
refactor(lineage): replace MUI Drawer and antd Modal with ui-core-com…
chirag-madlani Jul 6, 2026
07a7881
fix(lineage): resolve Playwright regressions from SlideoutMenu/Dialog…
chirag-madlani Jul 6, 2026
f49e20c
fix(lineage): drop unjustified zIndex override on ModalWithFunctionEd…
chirag-madlani Jul 6, 2026
9b8896e
fix(lineage): address review feedback on confirm click and dead onClo…
chirag-madlani Jul 6, 2026
3b90792
chore(lineage): import reactflow's own stylesheets directly
chirag-madlani Jul 6, 2026
d122726
Merge remote-tracking branch 'origin/main' into lineage-mui-to-core-c…
chirag-madlani Jul 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 8 additions & 4 deletions openmetadata-ui/src/main/resources/ui/playwright/utils/lineage.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,8 +189,10 @@ export const deleteEdge = async (

const deleteRes = page.waitForResponse('/api/v1/lineage/**');
await page
.locator('[data-testid="delete-edge-confirmation-modal"] .ant-btn-primary')
.dispatchEvent('click');
.locator(
'[data-testid="delete-edge-confirmation-modal"] [data-testid="confirm-button"]'
)
.click();
await deleteRes;
};

Expand Down Expand Up @@ -611,8 +613,10 @@ export const removeColumnLineage = async (

const deleteRes = page.waitForResponse('/api/v1/lineage');
await page
.locator('[data-testid="delete-edge-confirmation-modal"] .ant-btn-primary')
.dispatchEvent('click');
.locator(
'[data-testid="delete-edge-confirmation-modal"] [data-testid="confirm-button"]'
)
.click();
await deleteRes;

await editLineageClick(page);
Expand Down
85 changes: 53 additions & 32 deletions openmetadata-ui/src/main/resources/ui/src/context/LineageProvider/LineageProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import { Drawer } from '@mui/material';
import {
Button,
Dialog,
Modal,
ModalOverlay,
SlideoutMenu,
} from '@openmetadata/ui-core-components';
import { Home02 } from '@untitledui/icons';
import { Modal } from 'antd';
import { AxiosError } from 'axios';
import classNames from 'classnames';
import { isEmpty, isEqual, isUndefined, uniqueId, uniqWith } from 'lodash';
Expand Down Expand Up @@ -139,7 +144,6 @@ import {
parseLineageData,
removeLineageHandler,
} from '../../utils/EntityLineagePureUtils';
import { getLoadingStatusValue } from '../../utils/EntityLineageUtils';
import { updateNodeType } from '../../utils/EntityPureUtils';
import { getEntityReferenceFromEntity } from '../../utils/EntityReferenceUtils';
import { getQuickFilterQuery } from '../../utils/ExplorePureUtils';
Expand Down Expand Up @@ -2172,19 +2176,18 @@ const LineageProvider = ({ children }: LineageProviderProps) => {
<EntityLineageSidebar newAddedNode={newAddedNode} show={isEditMode} />

{!isEditMode && (selectedEdge || selectedNode) && (
<Drawer
anchor="right"
className="lineage-entity-panel"
<SlideoutMenu
isDismissable
className="tw:z-999"
data-testid="lineage-entity-panel"
open={isDrawerOpen}
sx={{
zIndex: 999,
'& .MuiDrawer-paper': {
width: 576,
},
}}
transitionDuration={300}
onClose={onCloseDrawer}>
dialogClassName="tw:gap-0 tw:items-stretch tw:min-h-0 tw:overflow-hidden tw:p-0 lineage-entity-panel"
isOpen={isDrawerOpen}
width={576}
onOpenChange={(open) => {
if (!open) {
onCloseDrawer();
}
}}>
{selectedNode && (
<EntitySummaryPanel
isSideDrawer
Expand All @@ -2208,26 +2211,44 @@ const LineageProvider = ({ children }: LineageProviderProps) => {
onEdgeDetailsUpdate={onEdgeDetailsUpdate}
/>
)}
</Drawer>
</SlideoutMenu>
)}

{showDeleteModal && (
<Modal
data-testid="delete-edge-confirmation-modal"
maskClosable={false}
okText={getLoadingStatusValue(
t('label.confirm'),
deletionState.loading,
deletionState.status
)}
open={showDeleteModal}
title={t('message.remove-lineage-edge')}
onCancel={() => {
setShowDeleteModal(false);
}}
onOk={onRemove}>
{getModalBodyText(selectedEdge as Edge)}
</Modal>
<ModalOverlay
isDismissable={!deletionState.loading}
Comment thread
greptile-apps[bot] marked this conversation as resolved.
isOpen={showDeleteModal}
style={{ zIndex: 999 }}
onOpenChange={(open) => {
if (!open && !deletionState.loading) {
setShowDeleteModal(false);
}
}}>
<Modal>
<Dialog data-testid="delete-edge-confirmation-modal" width={400}>
<Dialog.Header title={t('message.remove-lineage-edge')} />
<Dialog.Content>
{getModalBodyText(selectedEdge as Edge)}
</Dialog.Content>
<Dialog.Footer>
<Button
color="tertiary"
data-testid="cancel-button"
onPress={() => setShowDeleteModal(false)}>
{t('label.cancel')}
</Button>
<Button
color="primary"
data-testid="confirm-button"
isDisabled={deletionState.loading}
isLoading={deletionState.loading}
onPress={onRemove}>
{t('label.confirm')}
</Button>
</Dialog.Footer>
</Dialog>
</Modal>
</ModalOverlay>
)}
{showAddEdgeModal && (
<AddPipeLineModal
Expand Down
Loading