From ef0b03d4a90d48bd1d64be84e91d212eaa99f53b Mon Sep 17 00:00:00 2001 From: Karan Hotchandani <33024356+karanh37@users.noreply.github.com> Date: Wed, 23 Oct 2024 18:05:17 +0530 Subject: [PATCH] query builder improvements (#18377) --- .../QueryBuilderWidget/QueryBuilderWidget.tsx | 10 +++++----- .../ui/src/pages/AppInstall/AppInstall.component.tsx | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx index 61d9362d3dd..42b703adff2 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/common/Form/JSONSchema/JsonSchemaWidgets/QueryBuilderWidget/QueryBuilderWidget.tsx @@ -46,10 +46,10 @@ const QueryBuilderWidget: FC = ({ useAdvanceSearch(); const [searchResults, setSearchResults] = useState(0); const entityType = - (props.formContext?.entityType ?? props?.entityType) || EntityType.ALL; + (props.formContext?.entityType ?? schema?.entityType) || EntityType.ALL; const searchIndexMapping = searchClassBase.getEntityTypeSearchIndexMapping(); const searchIndex = searchIndexMapping[entityType as string]; - const outputType = props?.outputType ?? QueryBuilderOutputType.ELASTICSEARCH; + const outputType = schema?.outputType ?? QueryBuilderOutputType.ELASTICSEARCH; const fetchEntityCount = useCallback( async (queryFilter: Record) => { @@ -152,17 +152,17 @@ const QueryBuilderWidget: FC = ({ showIcon icon={} message={ - <> +
{t('message.search-entity-count', { count: searchResults, })} - + {t('message.click-here-to-view-assets-on-explore')} - +
} type="info" /> diff --git a/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.component.tsx b/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.component.tsx index 60eabf8ce79..9a303333f06 100644 --- a/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/pages/AppInstall/AppInstall.component.tsx @@ -193,7 +193,7 @@ const AppInstall = () => { case 2: return ( -
+