Skip to content

Commit 6aac1ce

Browse files
Rohit0301OpenMetadata Release Bot
authored andcommitted
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 (cherry picked from commit 0bd108b)
1 parent 5ed6613 commit 6aac1ce

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
@@ -648,16 +648,16 @@ describe('getCustomPropertiesSubFields', () => {
648648

649649
expect(result).toHaveLength(3);
650650

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

657-
expect(result[1].subfieldsKey).toBe('testTable.rows.Col2.keyword');
657+
expect(result[1].subfieldsKey).toBe('testTable.rows.Col2');
658658
expect(result[1].dataObject.label).toContain('Col2');
659659

660-
expect(result[2].subfieldsKey).toBe('testTable.rows.Col3.keyword');
660+
expect(result[2].subfieldsKey).toBe('testTable.rows.Col3');
661661
expect(result[2].dataObject.label).toContain('Col3');
662662
});
663663

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1397,15 +1397,15 @@ class AdvancedSearchClassBase {
13971397
case 'hyperlink-cp': {
13981398
return [
13991399
{
1400-
subfieldsKey: `${field.name}.url.keyword`,
1400+
subfieldsKey: `${field.name}.url`,
14011401
dataObject: {
14021402
type: 'text',
14031403
label: `${label} ${t('label.url')}`,
14041404
operators: TEXT_FIELD_OPERATORS,
14051405
},
14061406
},
14071407
{
1408-
subfieldsKey: `${field.name}.displayText.keyword`,
1408+
subfieldsKey: `${field.name}.displayText`,
14091409
dataObject: {
14101410
type: 'text',
14111411
label: `${label} ${t('label.display-text')}`,
@@ -1424,7 +1424,7 @@ class AdvancedSearchClassBase {
14241424
}
14251425

14261426
return columns.map((columnName) => ({
1427-
subfieldsKey: `${field.name}.rows.${columnName}.keyword`,
1427+
subfieldsKey: `${field.name}.rows.${columnName}`,
14281428
dataObject: {
14291429
type: 'text',
14301430
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)