Skip to content

Commit cb26118

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 2352a2c commit cb26118

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

638638
expect(result).toHaveLength(3);
639639

640-
expect(result[0].subfieldsKey).toBe('testTable.rows.Col1.keyword');
640+
expect(result[0].subfieldsKey).toBe('testTable.rows.Col1');
641641
expect(result[0].dataObject.type).toBe('text');
642642
expect(result[0].dataObject.label).toContain('Col1');
643643
expect(result[0].dataObject.operators).toBe(TEXT_FIELD_OPERATORS);
644644
expect(result[0].dataObject.valueSources).toEqual(['value']);
645645

646-
expect(result[1].subfieldsKey).toBe('testTable.rows.Col2.keyword');
646+
expect(result[1].subfieldsKey).toBe('testTable.rows.Col2');
647647
expect(result[1].dataObject.label).toContain('Col2');
648648

649-
expect(result[2].subfieldsKey).toBe('testTable.rows.Col3.keyword');
649+
expect(result[2].subfieldsKey).toBe('testTable.rows.Col3');
650650
expect(result[2].dataObject.label).toContain('Col3');
651651
});
652652

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1381,15 +1381,15 @@ class AdvancedSearchClassBase {
13811381
case 'hyperlink-cp': {
13821382
return [
13831383
{
1384-
subfieldsKey: `${field.name}.url.keyword`,
1384+
subfieldsKey: `${field.name}.url`,
13851385
dataObject: {
13861386
type: 'text',
13871387
label: `${label} ${t('label.url')}`,
13881388
operators: TEXT_FIELD_OPERATORS,
13891389
},
13901390
},
13911391
{
1392-
subfieldsKey: `${field.name}.displayText.keyword`,
1392+
subfieldsKey: `${field.name}.displayText`,
13931393
dataObject: {
13941394
type: 'text',
13951395
label: `${label} ${t('label.display-text')}`,
@@ -1408,7 +1408,7 @@ class AdvancedSearchClassBase {
14081408
}
14091409

14101410
return columns.map((columnName) => ({
1411-
subfieldsKey: `${field.name}.rows.${columnName}.keyword`,
1411+
subfieldsKey: `${field.name}.rows.${columnName}`,
14121412
dataObject: {
14131413
type: 'text',
14141414
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)