+
{t('label.schedule')}
{
EntityFields.TIER,
'extension',
'descriptionStatus',
+ 'entityType',
]);
});
});
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts
index 3fc27933053..05da5daaffd 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/AdvancedSearchClassBase.ts
@@ -610,6 +610,19 @@ class AdvancedSearchClassBase {
},
},
},
+ [EntityFields.ENTITY_TYPE]: {
+ label: t('label.entity-type-plural', { entity: t('label.entity') }),
+ type: 'select',
+ mainWidgetProps: this.mainWidgetProps,
+
+ fieldSettings: {
+ asyncFetch: this.autocomplete({
+ searchIndex: entitySearchIndex,
+ entityField: EntityFields.ENTITY_TYPE,
+ }),
+ useAsyncSearch: true,
+ },
+ },
};
}
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/JSONLogicSearchClassBase.ts b/openmetadata-ui/src/main/resources/ui/src/utils/JSONLogicSearchClassBase.ts
index 25bc69ed366..625dd967e5a 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/JSONLogicSearchClassBase.ts
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/JSONLogicSearchClassBase.ts
@@ -29,7 +29,7 @@ import {
import { SearchIndex } from '../enums/search.enum';
import { searchData } from '../rest/miscAPI';
import advancedSearchClassBase from './AdvancedSearchClassBase';
-import { renderQueryBuilderFilterButtons } from './QueryBuilderUtils';
+import { renderJSONLogicQueryBuilderButtons } from './QueryBuilderUtils';
class JSONLogicSearchClassBase {
baseConfig = AntdConfig as Config;
@@ -370,7 +370,7 @@ class JSONLogicSearchClassBase {
operatorLabel: t('label.condition') + ':',
showNot: false,
valueLabel: t('label.criteria') + ':',
- renderButton: renderQueryBuilderFilterButtons,
+ renderButton: renderJSONLogicQueryBuilderButtons,
},
};
diff --git a/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.tsx b/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.tsx
index de07b53e914..e3952c1e4fa 100644
--- a/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.tsx
+++ b/openmetadata-ui/src/main/resources/ui/src/utils/QueryBuilderUtils.tsx
@@ -10,7 +10,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-import { CloseOutlined } from '@ant-design/icons';
+import { CloseOutlined, PlusOutlined } from '@ant-design/icons';
import { Button } from 'antd';
import { t } from 'i18next';
import { isUndefined } from 'lodash';
@@ -404,6 +404,43 @@ export const renderQueryBuilderFilterButtons: RenderSettings['renderButton'] = (
return <>>;
};
+export const renderJSONLogicQueryBuilderButtons: RenderSettings['renderButton'] =
+ (props) => {
+ const type = props?.type;
+
+ if (type === 'delRule') {
+ return (
+ }
+ onClick={props?.onClick}
+ />
+ );
+ } else if (type === 'delRuleGroup') {
+ return (
+ }
+ onClick={props?.onClick}
+ />
+ );
+ } else if (type === 'addRule') {
+ return (
+ }
+ type="primary"
+ onClick={props?.onClick}
+ />
+ );
+ }
+
+ return <>>;
+ };
+
interface ElasticsearchQuery {
bool?: {
must?: ElasticsearchQuery[];