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

MINOR: Change sidbar data-quality menu #14789

Merged
merged 7 commits into from
Jan 19, 2024
Merged

MINOR: Change sidbar data-quality menu #14789

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
079541f
Change sidbar data-quality menu
Ashish8689 Jan 19, 2024
5d26336
minor changes
Ashish8689 Jan 19, 2024
e9190ea
localization keys added
Ashish8689 Jan 19, 2024
794df4d
minor fix
Ashish8689 Jan 19, 2024
999422b
fix unit test
Ashish8689 Jan 19, 2024
1fab936
removed unused routes
Ashish8689 Jan 19, 2024
11b43bd
Merge branch 'main' into sidebar-observability
Ashish8689 Jan 19, 2024
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
6 changes: 3 additions & 3 deletions openmetadata-ui/src/main/resources/ui/cypress/constants/redirections.constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,12 +66,12 @@ export const NAVBAR_DETAILS = {
url: `${BASE_URL}/explore/tables`,
},
quality: {
testid: `[data-testid="data-quality"]`,
subMenu: '[data-testid="app-bar-item-data-contract"]',
testid: `[data-testid="observability"]`,
subMenu: '[data-testid="app-bar-item-data-quality"]',
url: `${BASE_URL}/data-quality`,
},
incidentManager: {
testid: `[data-testid="data-quality"]`,
testid: `[data-testid="observability"]`,
subMenu: '[data-testid="app-bar-item-incident-manager"]',
url: `${BASE_URL}/incident-manager`,
},
Expand Down
8 changes: 4 additions & 4 deletions openmetadata-ui/src/main/resources/ui/cypress/e2e/Features/IncidentManager.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ describe('Incident Manager', () => {

it('Assign incident to user', () => {
cy.sidebarHover();
cy.get("[data-testid='data-quality'").click();
cy.get("[data-testid='observability'").click();
cy.sidebarClick('app-bar-item-incident-manager');
cy.get(`[data-testid="test-case-${NEW_TABLE_TEST_CASE.name}"]`).should(
'be.visible'
Expand Down Expand Up @@ -188,7 +188,7 @@ describe('Incident Manager', () => {
);
interceptURL('GET', '/api/v1/feed?entityLink=*&type=Task', 'getTaskFeed');
cy.sidebarHover();
cy.get("[data-testid='data-quality'").click();
cy.get("[data-testid='observability'").click();
cy.sidebarClick('app-bar-item-incident-manager');
cy.get(`[data-testid="test-case-${NEW_TABLE_TEST_CASE.name}"]`).click();
verifyResponseStatusCode('@getTestCase', 200);
Expand Down Expand Up @@ -227,7 +227,7 @@ describe('Incident Manager', () => {
);
interceptURL('GET', '/api/v1/feed?entityLink=*&type=Task', 'getTaskFeed');
cy.sidebarHover();
cy.get("[data-testid='data-quality'").click();
cy.get("[data-testid='observability'").click();
cy.sidebarClick('app-bar-item-incident-manager');
cy.get(`[data-testid="test-case-${NEW_TABLE_TEST_CASE.name}"]`).click();
verifyResponseStatusCode('@getTestCase', 200);
Expand Down Expand Up @@ -339,7 +339,7 @@ describe('Incident Manager', () => {
'getIncidentList'
);
cy.sidebarHover();
cy.get("[data-testid='data-quality'").click();
cy.get("[data-testid='observability'").click();
cy.sidebarClick('app-bar-item-incident-manager');
verifyResponseStatusCode('@getIncidentList', 200);

Expand Down
6 changes: 3 additions & 3 deletions openmetadata-ui/src/main/resources/ui/cypress/e2e/Flow/Collect.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ describe('Collect end point should work properly', () => {
},
dataQuality: {
name: 'Quality',
mainMenuId: `[data-testid="data-quality"]`,
subMenu: `[data-testid="app-bar-item-data-contract"]`,
mainMenuId: `[data-testid="observability"]`,
subMenu: `[data-testid="app-bar-item-data-quality"]`,
},
incidentManager: {
name: 'Incident Manager',
mainMenuId: `[data-testid="data-quality"]`,
mainMenuId: `[data-testid="observability"]`,
subMenu: `[data-testid="app-bar-item-incident-manager"]`,
},
insight: {
Expand Down
12 changes: 6 additions & 6 deletions openmetadata-ui/src/main/resources/ui/cypress/e2e/Pages/DataQualityAndProfiler.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,9 @@ const visitTestSuiteDetailsPage = (testSuiteName) => {

cy.sidebarHover();

cy.get('[data-testid="data-quality"]').click();
cy.get('[data-testid="observability"]').click();

cy.sidebarClick('app-bar-item-data-contract');
cy.sidebarClick('app-bar-item-data-quality');

cy.sidebarHoverOutside();

Expand Down Expand Up @@ -535,9 +535,9 @@ describe('Data Quality and Profiler should work properly', () => {

cy.sidebarHover();

cy.get('[data-testid="data-quality"]').click();
cy.get('[data-testid="observability"]').click();

cy.sidebarClick('app-bar-item-data-contract');
cy.sidebarClick('app-bar-item-data-quality');

cy.sidebarHoverOutside();

Expand Down Expand Up @@ -802,9 +802,9 @@ describe('Data Quality and Profiler should work properly', () => {

cy.sidebarHover();

cy.get('[data-testid="data-quality"]').click();
cy.get('[data-testid="observability"]').click();

cy.sidebarClick('app-bar-item-data-contract');
cy.sidebarClick('app-bar-item-data-quality');

cy.sidebarHoverOutside();

Expand Down
18 changes: 18 additions & 0 deletions openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-alert.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 13 additions & 0 deletions openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-observability.svg
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 0 additions & 4 deletions openmetadata-ui/src/main/resources/ui/src/assets/svg/ic-quality-v1.svg
View file
Open in desktop

This file was deleted.

16 changes: 7 additions & 9 deletions openmetadata-ui/src/main/resources/ui/src/components/MyData/LeftSidebar/LeftSidebar.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,12 @@ describe('LeftSidebar', () => {
</BrowserRouter>
);

const exploreLink = screen.getByTestId('app-bar-item-explore');
const qualityLink = screen.getByTestId('data-quality');
const insightLink = screen.getByTestId('app-bar-item-data-insight');
const settingsLink = screen.getByTestId('app-bar-item-settings');

expect(exploreLink).toBeInTheDocument();
expect(qualityLink).toBeInTheDocument();
expect(insightLink).toBeInTheDocument();
expect(settingsLink).toBeInTheDocument();
expect(screen.getByTestId('image')).toBeInTheDocument();
expect(screen.getByTestId('app-bar-item-explore')).toBeInTheDocument();
expect(screen.getByTestId('observability')).toBeInTheDocument();
expect(screen.getByTestId('app-bar-item-domain')).toBeInTheDocument();
expect(screen.getByTestId('governance')).toBeInTheDocument();
expect(screen.getByTestId('app-bar-item-settings')).toBeInTheDocument();
expect(screen.getByTestId('app-bar-item-logout')).toBeInTheDocument();
});
});
25 changes: 16 additions & 9 deletions openmetadata-ui/src/main/resources/ui/src/constants/LeftSidebar.constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,11 @@ import { ReactComponent as GovernIcon } from '../assets/svg/bank.svg';
import { ReactComponent as ClassificationIcon } from '../assets/svg/classification.svg';
import { ReactComponent as ExploreIcon } from '../assets/svg/globalsearch.svg';
import { ReactComponent as GlossaryIcon } from '../assets/svg/glossary.svg';
import { ReactComponent as DataContractIcon } from '../assets/svg/ic-data-contract.svg';
import { ReactComponent as AlertIcon } from '../assets/svg/ic-alert.svg';
import { ReactComponent as DataQualityIcon } from '../assets/svg/ic-data-contract.svg';
import { ReactComponent as DomainsIcon } from '../assets/svg/ic-domain.svg';
import { ReactComponent as IncidentMangerIcon } from '../assets/svg/ic-incident-manager.svg';
import { ReactComponent as QualityIcon } from '../assets/svg/ic-quality-v1.svg';
import { ReactComponent as ObservabilityIcon } from '../assets/svg/ic-observability.svg';
import { ReactComponent as SettingsIcon } from '../assets/svg/ic-settings-v1.svg';
import { ReactComponent as InsightsIcon } from '../assets/svg/lampcharge.svg';
import { ReactComponent as LogoutIcon } from '../assets/svg/logout.svg';
Expand All @@ -36,17 +37,17 @@ export const SIDEBAR_LIST = [
dataTestId: 'app-bar-item-explore',
},
{
key: 'data-quality',
label: i18next.t('label.quality'),
icon: QualityIcon,
dataTestId: 'data-quality',
key: ROUTES.OBSERVABILITY,
label: i18next.t('label.observability'),
icon: ObservabilityIcon,
dataTestId: 'observability',
children: [
{
key: ROUTES.DATA_QUALITY,
label: i18next.t('label.data-contract-plural'),
label: i18next.t('label.data-quality'),
redirect_url: ROUTES.DATA_QUALITY,
icon: DataContractIcon,
dataTestId: 'app-bar-item-data-contract',
icon: DataQualityIcon,
dataTestId: 'app-bar-item-data-quality',
},
{
key: ROUTES.INCIDENT_MANAGER,
Expand All @@ -56,6 +57,12 @@ export const SIDEBAR_LIST = [
dataTestId: 'app-bar-item-incident-manager',
isBeta: true,
},
{
key: ROUTES.OBSERVABILITY,
label: i18next.t('label.alert-plural'),
icon: AlertIcon,
dataTestId: 'app-bar-item-observability-alert',
},
],
},
{
Expand Down
2 changes: 2 additions & 0 deletions openmetadata-ui/src/main/resources/ui/src/constants/constants.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -320,6 +320,8 @@ export const ROUTES = {
CUSTOMIZE_PAGE: `/customize-page/:fqn/:pageFqn`,

ADD_CUSTOM_METRIC: `/add-custom-metric/${PLACEHOLDER_DASHBOARD_TYPE}/${PLACEHOLDER_ROUTE_FQN}`,

OBSERVABILITY: '/observability',
};

export const SOCKET_EVENTS = {
Expand Down
Loading