Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: remove quotes around fqn for domain #14055

Merged
merged 1 commit into from
Nov 22, 2023
Merged

fix: remove quotes around fqn for domain #14055

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions openmetadata-ui/src/main/resources/ui/cypress/common/DomainUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down Expand Up @@ -267,6 +279,8 @@ export const createDomain = (domainObj, validate) => {

cy.url().should('include', '/domain/');
checkDisplayName(domainObj.name);
checkAssetsCount(0);
checkDataProductsCount(0);
});
};

Expand Down
2 changes: 1 addition & 1 deletion openmetadata-ui/src/main/resources/ui/src/components/Auth/AuthProviders/AuthProvider.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ...src/components/DataProducts/DataProductsDetailsPage/DataProductsDetailsPage.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -208,7 +208,7 @@ const DataProductsDetailsPage = ({
'',
1,
0,
`(dataProducts.fullyQualifiedName:"${fqn}")`,
`(dataProducts.fullyQualifiedName:${fqn})`,
'',
'',
SearchIndex.ALL
Expand Down
6 changes: 3 additions & 3 deletions ...main/resources/ui/src/components/Domain/DomainDetailsPage/DomainDetailsPage.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ const DomainDetailsPage = ({
async (formData: CreateDataProduct) => {
const data = {
...formData,
domain: domain.name,
domain: domain.fullyQualifiedName,
};

try {
Expand Down Expand Up @@ -238,7 +238,7 @@ const DomainDetailsPage = ({
'',
1,
0,
`(domain.fullyQualifiedName:"${domainFqn}")`,
`(domain.fullyQualifiedName:${domainFqn})`,
'',
'',
SearchIndex.DATA_PRODUCT
Expand All @@ -258,7 +258,7 @@ const DomainDetailsPage = ({
'',
1,
0,
`(domain.fullyQualifiedName:"${fqn}")`,
`(domain.fullyQualifiedName:${fqn})`,
'',
'',
SearchIndex.ALL
Expand Down
2 changes: 1 addition & 1 deletion ...sources/ui/src/components/Domain/DomainTabs/DataProductsTab/DataProductsTab.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ const DataProductsTab = forwardRef(
'',
1,
PAGE_SIZE_LARGE,
`(domain.fullyQualifiedName:"${domainFqn}")`,
`(domain.fullyQualifiedName:${domainFqn})`,
'',
'',
SearchIndex.DATA_PRODUCT
Expand Down
4 changes: 2 additions & 2 deletions ...src/main/resources/ui/src/components/Glossary/GlossaryTerms/tabs/AssetsTabs.component.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}")`;
Expand Down