Refactor: field type and operators for enum custom properties (#24906)

Author: anuj-kumary

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

@@ -318,6 +318,13 @@ export const TEXT_FIELD_DESCRIPTION_OPERATORS = [
   'is_not_null',
 ];
 
+export const MULTISELECT_FIELD_OPERATORS = [
+  'multiselect_contains',
+  'multiselect_not_contains',
+  'multiselect_equals',
+  'multiselect_not_equals',
+];
+
 export const RANGE_FIELD_OPERATORS = ['between', 'not_between'];
 
 export const LIST_VALUE_OPERATORS = ['select_equals', 'select_not_equals'];

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

@@ -10,9 +10,13 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
+import { MULTISELECT_FIELD_OPERATORS } from '../constants/AdvancedSearch.constants';
 import { EntityFields } from '../enums/AdvancedSearch.enum';
 import { SearchIndex } from '../enums/search.enum';
+import { CustomPropertySummary } from '../rest/metadataTypeAPI.interface';
 import { AdvancedSearchClassBase } from './AdvancedSearchClassBase';
+import { getCustomPropertyAdvanceSearchEnumOptions } from './AdvancedSearchUtils';
+import { getEntityName } from './EntityUtils';
 
 jest.mock('../rest/miscAPI', () => ({
   getAggregateFieldOptions: jest.fn().mockImplementation(() =>
@@ -26,6 +30,14 @@ jest.mock('./JSONLogicSearchClassBase', () => ({
   getQueryBuilderFields: jest.fn(),
 }));
 
+jest.mock('./EntityUtils', () => ({
+  getEntityName: jest.fn(),
+}));
+
+jest.mock('./AdvancedSearchUtils', () => ({
+  getCustomPropertyAdvanceSearchEnumOptions: jest.fn(),
+}));
+
 describe('AdvancedSearchClassBase', () => {
   let advancedSearchClassBase: AdvancedSearchClassBase;
 
@@ -198,3 +210,62 @@ describe('getEntitySpecificQueryBuilderFields', () => {
     expect(Object.keys(result)).toEqual([]);
   });
 });
+
+describe('getCustomPropertiesSubFields', () => {
+  let advancedSearchClassBase: AdvancedSearchClassBase;
+  const mockGetEntityName = getEntityName as jest.Mock;
+  const mockGetCustomPropertyAdvanceSearchEnumOptions =
+    getCustomPropertyAdvanceSearchEnumOptions as jest.Mock;
+
+  beforeEach(() => {
+    advancedSearchClassBase = new AdvancedSearchClassBase();
+    jest.clearAllMocks();
+  });
+
+  it('should return correct configuration for enum type custom property', () => {
+    const mockField = {
+      name: 'statusField',
+      type: 'enum',
+      customPropertyConfig: {
+        config: {
+          values: ['ACTIVE', 'INACTIVE', 'PENDING'],
+        },
+      },
+    };
+
+    const mockLabel = 'Status Field';
+    const mockEnumOptions = [
+      { value: 'ACTIVE', title: 'Active' },
+      { value: 'INACTIVE', title: 'Inactive' },
+      { value: 'PENDING', title: 'Pending' },
+    ];
+
+    mockGetEntityName.mockReturnValue(mockLabel);
+    mockGetCustomPropertyAdvanceSearchEnumOptions.mockReturnValue(
+      mockEnumOptions
+    );
+
+    const result = advancedSearchClassBase.getCustomPropertiesSubFields(
+      mockField as CustomPropertySummary
+    );
+
+    expect(mockGetEntityName).toHaveBeenCalledWith(mockField);
+    expect(mockGetCustomPropertyAdvanceSearchEnumOptions).toHaveBeenCalledWith([
+      'ACTIVE',
+      'INACTIVE',
+      'PENDING',
+    ]);
+
+    expect(result).toEqual({
+      subfieldsKey: 'statusField',
+      dataObject: {
+        type: 'multiselect',
+        label: mockLabel,
+        operators: MULTISELECT_FIELD_OPERATORS,
+        fieldSettings: {
+          listValues: mockEnumOptions,
+        },
+      },
+    });
+  });
+});

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

@@ -24,6 +24,7 @@ import { debounce, isEmpty, sortBy, toLower } from 'lodash';
 import { CustomPropertyEnumConfig } from '../components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.interface';
 import {
   LIST_VALUE_OPERATORS,
+  MULTISELECT_FIELD_OPERATORS,
   NULL_CHECK_OPERATORS,
   RANGE_FIELD_OPERATORS,
   SEARCH_INDICES_WITH_COLUMNS_FIELD,
@@ -1248,9 +1249,9 @@ class AdvancedSearchClassBase {
         return {
           subfieldsKey: field.name,
           dataObject: {
-            type: 'select',
+            type: 'multiselect',
             label,
-            operators: LIST_VALUE_OPERATORS,
+            operators: MULTISELECT_FIELD_OPERATORS,
             fieldSettings: {
               listValues: getCustomPropertyAdvanceSearchEnumOptions(
                 (field.customPropertyConfig?.config as CustomPropertyEnumConfig)