Merge remote-tracking branch 'upstream/main' into GEN-1192

open-metadata · Sep 16, 2024 · abfc1c0 · abfc1c0
2 parents b92ef8a + 23c6aa3
commit abfc1c0
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 4 deletions.
diff --git a/ingestion/examples/sample_data/datasets/tables.json b/ingestion/examples/sample_data/datasets/tables.json
@@ -1604,10 +1604,23 @@
  },
  {
  "name": "shipping_address",
- "dataType": "ARRAY",
- "arrayDataType": "STRUCT",
- "dataTypeDisplay": "array<struct<name:varchar(32),street_address:varchar(128), city:varchar(32),postcode:varchar(8)>>",
- "tags": []
+ "dataType": "ARRAY",
+ "arrayDataType": "STRUCT",
+ "dataTypeDisplay": "array<struct<type:string,provider:array<int>>>",
+ "children": [
+ {
+ "dataType": "STRING",
+ "dataTypeDisplay": "string",
+ "name": "type"
+ },
+ {
+ "dataType": "ARRAY",
+ "arrayDataType": "INT",
+ "dataTypeDisplay": "array<int>",
+ "name": "provider"
+ }
+ ],
+ "tags": []
  },
  {
  "name": "orders",

diff --git a/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Tags.spec.ts b/openmetadata-ui/src/main/resources/ui/playwright/e2e/Pages/Tags.spec.ts
@@ -297,10 +297,14 @@ test('Classification Page', async ({ page }) => {
  const getTags = page.waitForResponse('/api/v1/tags*');
  await sidebarClick(page, SidebarItem.TAGS);
  await getTags;
+ const classificationResponse = page.waitForResponse(
+ `/api/v1/tags?*parent=${encodeURIComponent(NEW_CLASSIFICATION.name)}*`
+ );
  await page
  .locator(`[data-testid="side-panel-classification"]`)
  .filter({ hasText: NEW_CLASSIFICATION.displayName })
  .click();
+ await classificationResponse;
 
  await expect(page.locator('.activeCategory')).toContainText(
  NEW_CLASSIFICATION.displayName
@@ -324,10 +328,14 @@ test('Classification Page', async ({ page }) => {
  const getTags = page.waitForResponse('/api/v1/tags*');
  await sidebarClick(page, SidebarItem.TAGS);
  await getTags;
+ const classificationResponse = page.waitForResponse(
+ `/api/v1/tags?*parent=${encodeURIComponent(NEW_CLASSIFICATION.name)}*`
+ );
  await page
  .locator(`[data-testid="side-panel-classification"]`)
  .filter({ hasText: NEW_CLASSIFICATION.displayName })
  .click();
+ await classificationResponse;
 
  await expect(page.locator('.activeCategory')).toContainText(
  NEW_CLASSIFICATION.displayName