Skip to content

Commit 2741b5d

Browse files
Merge branch 'main' into feature/data-quality-check-impact
2 parents b5d361d + 813d325 commit 2741b5d

15 files changed

Lines changed: 328 additions & 54 deletions

File tree

.github/workflows/playwright-postgresql-e2e.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,7 @@ jobs:
158158
--project=DataAssetRulesEnabled \
159159
--project=DataAssetRulesDisabled \
160160
--project=Basic \
161+
--project=SearchRBAC \
161162
162163
else
163164
# Shards 2-6 run common chromium tests equally distributed (5-way sharding)

.github/workflows/yarn-coverage.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,8 @@ jobs:
118118
-Dsonar.pullrequest.base=main \
119119
-Dsonar.pullrequest.github.repository=OpenMetadata \
120120
-Dsonar.scm.revision=${{ github.event.pull_request.head.sha }} \
121-
-Dsonar.pullrequest.provider=github
121+
-Dsonar.pullrequest.provider=github \
122+
-Dsonar.scm.disabled=true
122123
env:
123124
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
124125
SONAR_TOKEN: ${{ secrets.UI_SONAR_TOKEN }}

openmetadata-spec/src/main/resources/json/schema/entity/services/connections/pipeline/nifi/clientCertificateAuth.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,12 @@
77
"type": "object",
88
"properties": {
99
"certificateAuthorityPath": {
10-
"title": "Certificat Authority Path",
10+
"title": "Certificate Authority Path",
1111
"description": "Path to the root CA certificate",
1212
"type": "string"
1313
},
1414
"clientCertificatePath": {
15-
"title": "Client Certificat",
15+
"title": "Client Certificate",
1616
"description": "Path to the client certificate",
1717
"type": "string"
1818
},

openmetadata-spec/src/main/resources/json/schema/entity/services/connections/pipeline/nifiConnection.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
"javaType": "org.openmetadata.schema.services.connections.pipeline.NifiClientAuth",
4646
"properties": {
4747
"certificateAuthorityPath":{
48-
"title":"Certificat Authority Path",
48+
"title":"Certificate Authority Path",
4949
"description": "Path to the root CA certificate",
5050
"type": "string"
5151
},
5252
"clientCertificatePath":{
53-
"title":"Client Certificat",
53+
"title":"Client Certificate",
5454
"description": "Path to the client certificate",
5555
"type": "string"
5656
},

openmetadata-ui/src/main/resources/ui/playwright.config.ts

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ export default defineConfig({
8181
// Added admin setup as a dependency. This will authorize the page with an admin user before running the test. doc: https://playwright.dev/docs/auth#multiple-signed-in-roles
8282
dependencies: ['setup', 'entity-data-setup'],
8383
grepInvert: [/@data-insight/, /@basic/, /@knowledge-graph/],
84-
teardown: 'SearchRBAC',
84+
teardown: 'entity-data-teardown',
8585
testIgnore: [
8686
'**/nightly/**',
8787
'**/Auth/**',
@@ -91,12 +91,6 @@ export default defineConfig({
9191
'**/SearchRBAC.spec.ts',
9292
],
9393
},
94-
{
95-
name: 'SearchRBAC',
96-
testMatch: '**/SearchRBAC.spec.ts',
97-
use: { ...devices['Desktop Chrome'] },
98-
teardown: 'entity-data-teardown',
99-
},
10094
{
10195
name: 'entity-data-teardown',
10296
testMatch: '**/entity-data.teardown.ts',
@@ -141,6 +135,13 @@ export default defineConfig({
141135
dependencies: ['setup'],
142136
fullyParallel: true,
143137
},
138+
{
139+
name: 'SearchRBAC',
140+
testMatch: '**/SearchRBAC.spec.ts',
141+
dependencies: ['DataAssetRulesDisabled'],
142+
use: { ...devices['Desktop Chrome'] },
143+
teardown: 'entity-data-teardown',
144+
},
144145
// System Certification Tags tests modify global shared state (system tags like Gold, Silver, Bronze)
145146
// They must run in isolation after the main chromium project to avoid flakiness
146147
{

openmetadata-ui/src/main/resources/ui/playwright/e2e/Features/RestoreEntityInheritedFields.spec.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -104,6 +104,7 @@ entities.forEach((EntityClass) => {
104104
await redirectToHomePage(page);
105105

106106
await entity.visitEntityPage(page);
107+
107108
await assignDataProduct(page, domain.responseData, [
108109
dataProduct.responseData,
109110
]);

openmetadata-ui/src/main/resources/ui/playwright/e2e/nightly/ServiceIngestion.spec.ts

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -523,14 +523,23 @@ test.describe.serial(
523523
await pipelineRow.getByTestId('more-actions').click();
524524
await expect(page.getByTestId('run-button')).toBeVisible();
525525

526-
// Trigger a pipeline run via the run button
526+
// Trigger a pipeline run via the run button.
527+
// Also register a waiter for the pipelineStatus refresh that follows the trigger
528+
// (the route mock adds 8s latency, so we must await the response before asserting).
529+
// Both waiters are registered before the click to avoid race conditions.
527530
const triggerResponse = page.waitForResponse(
528531
(res) =>
529532
res.url().includes('/services/ingestionPipelines/trigger/') &&
530533
res.request().method() === 'POST'
531534
);
535+
const statusRefreshResponse = page.waitForResponse(
536+
(res) =>
537+
res.url().includes('/pipelineStatus') &&
538+
res.request().method() === 'GET'
539+
);
532540
await page.getByTestId('run-button').click();
533541
await triggerResponse;
542+
await statusRefreshResponse;
534543

535544
// Verify the run was triggered by checking the pipeline row shows a running state
536545
await expect(

openmetadata-ui/src/main/resources/ui/playwright/utils/common.ts

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -422,6 +422,9 @@ export const assignDataProduct = async (
422422
action: 'Add' | 'Edit' = 'Add',
423423
parentId = 'KnowledgePanel.DataProducts'
424424
) => {
425+
await expect(page.getByTestId('domain-link')).toContainText(
426+
domain.displayName
427+
);
425428
await page
426429
.getByTestId(parentId)
427430
.getByTestId('data-products-container')

openmetadata-ui/src/main/resources/ui/src/components/Entity/EntityLineage/CanvasButtonPopover.component.tsx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,9 @@ export const CanvasButtonPopover: React.FC<CanvasButtonPopoverProps> = ({
5959
...position,
6060
pointerEvents: 'all',
6161
zIndex: 1000,
62+
background: 'none',
63+
border: 'none',
64+
padding: 0,
6265
}}
6366
onMouseEnter={handleMouseEnter}
6467
onMouseLeave={onMouseLeave}>

openmetadata-ui/src/main/resources/ui/src/constants/Table.constants.ts

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,13 @@ export const TABLE_CONSTRAINTS_TYPE_OPTIONS = [
5353
},
5454
value: ConstraintType.DistKey,
5555
},
56+
{
57+
label: 'label.entity-key',
58+
labelData: {
59+
entity: 'label.cluster',
60+
},
61+
value: ConstraintType.ClusterKey,
62+
},
5663
{
5764
label: 'label.entity-key',
5865
labelData: {

0 commit comments

Comments
 (0)