From 9c990fef1967bd64db516e21a416ac5cf4f59e34 Mon Sep 17 00:00:00 2001 From: karanh37 <33024356+karanh37@users.noreply.github.com> Date: Wed, 22 Nov 2023 13:52:27 +0530 Subject: [PATCH] fix: remove quotes around fqn (#14055) --- .../resources/ui/cypress/common/DomainUtils.js | 14 ++++++++++++++ .../components/Auth/AuthProviders/AuthProvider.tsx | 2 +- .../DataProductsDetailsPage.component.tsx | 2 +- .../DomainDetailsPage.component.tsx | 6 +++--- .../DataProductsTab/DataProductsTab.component.tsx | 2 +- .../GlossaryTerms/tabs/AssetsTabs.component.tsx | 4 ++-- 6 files changed, 22 insertions(+), 8 deletions(-) diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/DomainUtils.js b/openmetadata-ui/src/main/resources/ui/cypress/common/DomainUtils.js index 7ad16e9efd5..6e6ba1d6fb7 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/common/DomainUtils.js +++ b/openmetadata-ui/src/main/resources/ui/cypress/common/DomainUtils.js @@ -62,6 +62,18 @@ const checkDisplayName = (displayName) => { }); }; +const checkDataProductsCount = (dataProductsCount) => { + cy.get('[data-testid="data_products"] [data-testid="count"]') + .scrollIntoView() + .eq(dataProductsCount); +}; + +const checkAssetsCount = (assetsCount) => { + cy.get('[data-testid="assets"] [data-testid="count"]') + .scrollIntoView() + .eq(assetsCount); +}; + const updateOwner = (newOwner) => { interceptURL('PATCH', `/api/v1/domains/*`, 'patchOwner'); interceptURL('GET', '/api/v1/users?limit=25&isBot=false', 'getUsers'); @@ -267,6 +279,8 @@ export const createDomain = (domainObj, validate) => { cy.url().should('include', '/domain/'); checkDisplayName(domainObj.name); + checkAssetsCount(0); + checkDataProductsCount(0); }); }; diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx index b12eeb87b1b..64cbfcdaf9a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx @@ -429,7 +429,7 @@ export const AuthProvider = ({ // Parse and update the query parameter const queryParams = Qs.parse(config.url.split('?')[1]); // adding quotes for exact matching - const domainStatement = `(domain.fullyQualifiedName:"${activeDomain}")`; + const domainStatement = `(domain.fullyQualifiedName:${activeDomain})`; queryParams.q = queryParams.q ?? ''; queryParams.q += isEmpty(queryParams.q) ? domainStatement diff --git a/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx index f23d7e664e9..da55ed0f02a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx @@ -208,7 +208,7 @@ const DataProductsDetailsPage = ({ '', 1, 0, - `(dataProducts.fullyQualifiedName:"${fqn}")`, + `(dataProducts.fullyQualifiedName:${fqn})`, '', '', SearchIndex.ALL diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx index 4d0af1fe966..6f8603f7229 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx @@ -190,7 +190,7 @@ const DomainDetailsPage = ({ async (formData: CreateDataProduct) => { const data = { ...formData, - domain: domain.name, + domain: domain.fullyQualifiedName, }; try { @@ -238,7 +238,7 @@ const DomainDetailsPage = ({ '', 1, 0, - `(domain.fullyQualifiedName:"${domainFqn}")`, + `(domain.fullyQualifiedName:${domainFqn})`, '', '', SearchIndex.DATA_PRODUCT @@ -258,7 +258,7 @@ const DomainDetailsPage = ({ '', 1, 0, - `(domain.fullyQualifiedName:"${fqn}")`, + `(domain.fullyQualifiedName:${fqn})`, '', '', SearchIndex.ALL diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx index 2970a2ca63e..f7cab2837bf 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx @@ -58,7 +58,7 @@ const DataProductsTab = forwardRef( '', 1, PAGE_SIZE_LARGE, - `(domain.fullyQualifiedName:"${domainFqn}")`, + `(domain.fullyQualifiedName:${domainFqn})`, '', '', SearchIndex.DATA_PRODUCT diff --git a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx index 1f5702965e1..0d629ea225a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx @@ -148,10 +148,10 @@ const AssetsTabs = forwardRef( const queryParam = useMemo(() => { switch (type) { case AssetsOfEntity.DOMAIN: - return `(domain.fullyQualifiedName:"${fqn}")`; + return `(domain.fullyQualifiedName:${fqn})`; case AssetsOfEntity.DATA_PRODUCT: - return `(dataProducts.fullyQualifiedName:"${fqn}")`; + return `(dataProducts.fullyQualifiedName:${fqn})`; case AssetsOfEntity.TEAM: return `(owner.fullyQualifiedName:"${fqn}")`;