Skip to content

Commit 0bd108b

Browse files
authored
fix: resolve .keyword suffix in hyperlink workflow rules and Tags/Tier field display ambiguity in check condition (#27799)
* fix: resolve .keyword suffix in hyperlink workflow rules and Tags/Tier field display ambiguity in check condition * fixed .keyword issue for table cp * removed irrelavent .keyword suffix * fixed unit test
1 parent 8291e06 commit 0bd108b

3 files changed

Lines changed: 6 additions & 7 deletions

File tree

openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -646,16 +646,16 @@ describe('getCustomPropertiesSubFields', () => {
646646

647647
expect(result).toHaveLength(3);
648648

649-
expect(result[0].subfieldsKey).toBe('testTable.rows.Col1.keyword');
649+
expect(result[0].subfieldsKey).toBe('testTable.rows.Col1');
650650
expect(result[0].dataObject.type).toBe('text');
651651
expect(result[0].dataObject.label).toContain('Col1');
652652
expect(result[0].dataObject.operators).toBe(TEXT_FIELD_OPERATORS);
653653
expect(result[0].dataObject.valueSources).toEqual(['value']);
654654

655-
expect(result[1].subfieldsKey).toBe('testTable.rows.Col2.keyword');
655+
expect(result[1].subfieldsKey).toBe('testTable.rows.Col2');
656656
expect(result[1].dataObject.label).toContain('Col2');
657657

658-
expect(result[2].subfieldsKey).toBe('testTable.rows.Col3.keyword');
658+
expect(result[2].subfieldsKey).toBe('testTable.rows.Col3');
659659
expect(result[2].dataObject.label).toContain('Col3');
660660
});
661661

openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1401,15 +1401,15 @@ class AdvancedSearchClassBase {
14011401
case 'hyperlink-cp': {
14021402
return [
14031403
{
1404-
subfieldsKey: `${field.name}.url.keyword`,
1404+
subfieldsKey: `${field.name}.url`,
14051405
dataObject: {
14061406
type: 'text',
14071407
label: `${label} ${t('label.url')}`,
14081408
operators: TEXT_FIELD_OPERATORS,
14091409
},
14101410
},
14111411
{
1412-
subfieldsKey: `${field.name}.displayText.keyword`,
1412+
subfieldsKey: `${field.name}.displayText`,
14131413
dataObject: {
14141414
type: 'text',
14151415
label: `${label} ${t('label.display-text')}`,
@@ -1428,7 +1428,7 @@ class AdvancedSearchClassBase {
14281428
}
14291429

14301430
return columns.map((columnName) => ({
1431-
subfieldsKey: `${field.name}.rows.${columnName}.keyword`,
1431+
subfieldsKey: `${field.name}.rows.${columnName}`,
14321432
dataObject: {
14331433
type: 'text',
14341434
label: `${label} - ${columnName}`,

openmetadata-ui/src/main/resources/ui/src/utils/JSONLogicSearchClassBase.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -326,7 +326,6 @@ class JSONLogicSearchClassBase {
326326
label: t('label.tier'),
327327
type: '!group',
328328
mode: 'some',
329-
fieldName: 'tags',
330329
defaultField: 'tagFQN',
331330
subfields: {
332331
tagFQN: {

0 commit comments

Comments
 (0)