diff --git a/openmetadata-ui/src/main/resources/ui/cypress/common/common.js b/openmetadata-ui/src/main/resources/ui/cypress/common/common.js index ea83acd0147..df30641c00d 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/common/common.js +++ b/openmetadata-ui/src/main/resources/ui/cypress/common/common.js @@ -475,7 +475,8 @@ export const visitEntityDetailsPage = ( serviceName, entity, dataTestId, - entityType + entityType, + count = 0 ) => { interceptURL('GET', '/api/v1/*/name/*', 'getEntityDetails'); interceptURL( @@ -486,7 +487,7 @@ export const visitEntityDetailsPage = ( interceptURL( 'GET', `/api/v1/search/suggest?q=*&index=*`, - `searchQuery-${entity}` + `searchQuery-${entity}-${count}` ); interceptURL('GET', `/api/v1/search/*`, 'explorePageSearch'); const id = dataTestId ?? `${serviceName}-${term}`; @@ -499,7 +500,7 @@ export const visitEntityDetailsPage = ( // searching term in search box cy.get('[data-testid="searchBox"]').scrollIntoView().should('be.visible'); cy.get('[data-testid="searchBox"]').type(term); - verifyResponseStatusCode(`@searchQuery-${entity}`, 200); + verifyResponseStatusCode(`@searchQuery-${entity}-${count}`, 200); cy.get('body').then(($body) => { // checking if requested term is available in search suggestion if ($body.find(`[data-testid="${id}"] [data-testid="data-name"]`).length) { diff --git a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/DataConsumerRole.spec.js b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/DataConsumerRole.spec.js index 06b59fb11ce..0a0f5775b8f 100644 --- a/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/DataConsumerRole.spec.js +++ b/openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/DataConsumerRole.spec.js @@ -211,7 +211,10 @@ describe('DataConsumer Edit policy should work properly', () => { visitEntityDetailsPage( ENTITIES.table.term, ENTITIES.table.serviceName, - ENTITIES.table.entity + ENTITIES.table.entity, + undefined, + undefined, + 1 ); cy.get('[data-testid="add-tag"]') @@ -225,7 +228,10 @@ describe('DataConsumer Edit policy should work properly', () => { visitEntityDetailsPage( ENTITIES.dashboard.term, ENTITIES.dashboard.serviceName, - ENTITIES.dashboard.entity + ENTITIES.dashboard.entity, + undefined, + undefined, + 1 ); cy.get('[data-testid="add-tag"]') diff --git a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx index cba134ddbf2..acd94db5437 100644 --- a/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx +++ b/openmetadata-ui/src/main/resources/ui/src/components/ActivityFeed/ActivityFeedCard/ActivityFeedCard.tsx @@ -163,7 +163,15 @@ const ActivityFeedCard: FC = ({ return ( <> -
+
{
{name}
{userRoleArr.map((userRole, i) => ( {userRole} @@ -287,7 +287,7 @@ const Appbar: React.FC = (): JSX.Element => { data-testid="user-name" to={getUserPath(currentUser?.name as string)}> {name} @@ -336,7 +336,7 @@ const Appbar: React.FC = (): JSX.Element => { {teams.map((t, i) => ( @@ -364,7 +364,7 @@ const Appbar: React.FC = (): JSX.Element => { dropDownOption.push({ label: ( {t('label.logout')} diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/app.less b/openmetadata-ui/src/main/resources/ui/src/styles/app.less index 6512e451acd..88da64606da 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/app.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/app.less @@ -248,6 +248,11 @@ a[href].link-text-grey, .bg-grey-4 { background-color: @grey-4; } + +.bg-grey-1-hover:hover { + background-color: @grey-1; +} + .bg-white { background-color: @white; } diff --git a/openmetadata-ui/src/main/resources/ui/src/styles/spacing.less b/openmetadata-ui/src/main/resources/ui/src/styles/spacing.less index 48d18403cac..42bf069ca2a 100644 --- a/openmetadata-ui/src/main/resources/ui/src/styles/spacing.less +++ b/openmetadata-ui/src/main/resources/ui/src/styles/spacing.less @@ -93,6 +93,11 @@ .m--r-7 { margin-right: -28px; } +.m--x-sm { + margin-left: -@margin-sm; + margin-right: -@margin-sm; +} + .m--x-6 { margin-left: -1.5rem /* -24px */; margin-right: -1.5rem /* -24px */;