From 8aef65148fcd002b4b4580c911d004cf2eb5cd66 Mon Sep 17 00:00:00 2001
From: Dhruv Parmar <83108871+dhruvjsx@users.noreply.github.com>
Date: Fri, 1 Aug 2025 09:55:06 +0530
Subject: [PATCH] Fix(ui): Failing Playwright Custom Property  (#22680)

---
 .../AdvanceSearchProvider.component.tsx       | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx
index 1ae4a612093..b342b5ae183 100644
--- a/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/components/Explore/AdvanceSearchProvider/AdvanceSearchProvider.component.tsx
@@ -13,12 +13,13 @@
 import {
   Config,
   Field,
+  FieldOrGroup,
   ImmutableTree,
   OldJsonTree,
   Utils as QbUtils,
   ValueSource,
 } from '@react-awesome-query-builder/antd';
-import { isEmpty, isEqual, isNil, isString } from 'lodash';
+import { get, isEmpty, isEqual, isNil, isString } from 'lodash';
 import Qs from 'qs';
 import {
   createContext,
@@ -29,6 +30,7 @@ import {
   useState,
 } from 'react';
 import { useNavigate } from 'react-router-dom';
+import { EntityType } from '../../../enums/entity.enum';
 import { SearchIndex } from '../../../enums/search.enum';
 import useCustomLocation from '../../../hooks/useCustomLocation/useCustomLocation';
 import { TabsInfoData } from '../../../pages/ExplorePage/ExplorePage.interface';
@@ -224,14 +226,18 @@ export const AdvanceSearchProvider = ({
   }, [navigate, location.pathname]);
 
   const fetchCustomPropertyType = async () => {
-    const subfields: Record<string, Field> = {};
+    const subfields: Record<string, FieldOrGroup> = {};
 
     try {
       const res = await getAllCustomProperties();
 
       Object.entries(res).forEach(([resEntityType, fields]) => {
         // If entityType is specified, only include custom properties for that entity type
-        if (entityType && resEntityType !== entityType) {
+        if (
+          entityType &&
+          entityType !== EntityType.ALL &&
+          resEntityType !== entityType
+        ) {
           return;
         }
 
@@ -263,8 +269,11 @@ export const AdvanceSearchProvider = ({
                       resEntityType.charAt(0).toUpperCase() +
                       resEntityType.slice(1),
                     type: '!group',
-                    subfields: entitySubfields,
-                  } as Field;
+                    subfields: {
+                      ...get(subfields[resEntityType], 'subfields', {}),
+                      ...entitySubfields,
+                    },
+                  };
                 }
               }
             }