Skip to content

FIX - Merge contract w/ terms of service#25876

Merged
harshach merged 1 commit intomainfrom
dc-import-export-flow
Feb 14, 2026
Merged

FIX - Merge contract w/ terms of service#25876
harshach merged 1 commit intomainfrom
dc-import-export-flow

Conversation

@pmbrull
Copy link
Copy Markdown
Collaborator

@pmbrull pmbrull commented Feb 13, 2026

Describe your changes:

Clean the process of create -> export -> import (merge) with ToS

Type of change:

  • Bug fix
  • Improvement
  • New feature
  • Breaking change (fix or feature that would cause existing functionality to not work as expected)
  • Documentation

Checklist:

  • I have read the CONTRIBUTING document.
  • My PR title is Fixes <issue-number>: <short explanation>
  • I have commented on my code, particularly in hard-to-understand areas.
  • For JSON Schema changes: I updated the migration scripts or explained why it is not needed.

Summary by Gitar

  • Fixes type mismatch bug in data contract merge imports where termsOfUse field conversion from object to string format caused incorrect JSON Patch operations
  • Adds type conversion logic to transform incoming string termsOfUse values back to entity object format {content, inherited} before generating patch operations
  • Preserves existing properties during merge by spreading the existing termsOfUse object and only updating the content field
  • Includes comprehensive testing with unit test verifying correct patch operation structure (/termsOfUse/content path) and E2E test covering full create → export → import → verify workflow
  • Resolves schema format inconsistency between DataContract entity (object-typed termsOfUse) and CreateDataContract API (string-typed termsOfUse) during OpenMetadata format imports

@gitar-bot
Copy link
Copy Markdown

gitar-bot Bot commented Feb 13, 2026

🔍 CI failure analysis for 4089783: The CI failures are unrelated to this PR's data contract changes. Tests failing in Glossary, Settings, and other features show pre-existing flakiness, not issues from the import/export fix.

Issue

Playwright E2E test suite failed with 2 hard failures and 9 flaky tests.

Root Cause

The failures are NOT related to this PR's changes. This PR only modifies data contract import/export functionality in three files:

  • ODCSImportExport.spec.ts
  • ODCSImportModal.component.tsx
  • ODCSImportModal.test.tsx

The failing tests are in completely different feature areas:

  1. BulkEditEntity.spec.ts - Glossary Term bulk editing (hard failure)
  2. SettingsNavigationPage.spec.ts - Settings navigation drag & drop (hard failure)
  3. Nine flaky tests spanning Glossary operations, Online Users, Impact Analysis, Data Quality, and Permissions

Details

Common failure patterns indicate test infrastructure instability:

  • Timeout errors: Target page, context or browser has been closed - suggests environment issues
  • Element visibility failures: Components not rendering within timeout (5000ms) - typical flaky test behavior
  • Undefined values: One test attempted fill(undefined) - test data setup issue

Importantly, all 643 passing tests include the new data contract tests added in this PR, confirming the changes work correctly.

Code Review ✅ Approved

Clean, well-targeted fix for termsOfUse type mismatch during contract merge. The string-to-object conversion is correct, preserves existing properties, and handles edge cases. Both unit and E2E tests are thorough and follow existing patterns.

Tip

Comment Gitar fix CI or enable auto-apply: gitar auto-apply:on

Options

Auto-apply is off → Gitar will not commit updates to this branch.
Display: compact → Showing less information.

Comment with these commands to change:

Auto-apply Compact
gitar auto-apply:on         
gitar display:verbose         

Was this helpful? React with 👍 / 👎 | Gitar

@github-actions
Copy link
Copy Markdown
Contributor

Jest test Coverage

UI tests summary

Lines Statements Branches Functions
Coverage: 65%
65.66% (56175/85557) 45.04% (29338/65136) 47.86% (8868/18529)

@sonarqubecloud
Copy link
Copy Markdown

@harshach harshach merged commit 2af2557 into main Feb 14, 2026
21 of 22 checks passed
@harshach harshach deleted the dc-import-export-flow branch February 14, 2026 18:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Ingestion safe to test Add this label to run secure Github workflows on PRs

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants