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: vertical menu items active highlight #394

Open
wants to merge 12 commits into
base: main
Choose a base branch
from
Open

fix: vertical menu items active highlight #394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
71658db
fix: vertical menu now correctly highlights active item
markuczy Oct 21, 2024
0bc1d88
Merge branch 'main' into feat/menu-item-active
markuczy Oct 21, 2024
f721da5
fix: router change reaction to ensure correct active item displayed
markuczy Oct 21, 2024
8a03887
fix: lint fixes
markuczy Oct 21, 2024
df08470
fix: fix tests
markuczy Oct 21, 2024
d95dd3a
fix: sonar code coverage
markuczy Oct 21, 2024
785f814
fix: fix sonar issues
markuczy Oct 21, 2024
42f069a
fix: sonar code coverage
markuczy Oct 21, 2024
302ccc7
fix: destroy topic on component destroy
markuczy Oct 22, 2024
854f6e3
Merge branch 'main' into feat/menu-item-active
markuczy Oct 23, 2024
e9a2185
Merge branch 'main' into feat/menu-item-active
markuczy Oct 28, 2024
d789092
Merge branch 'main' into feat/menu-item-active
markuczy Nov 29, 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
41 changes: 41 additions & 0 deletions src/app/remotes/vertical-main-menu/vertical-main-manu.component.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,42 @@
@import './../../shared/sidebar-panelmenu.scss';

:host ::ng-deep {
.p-panelmenu {
.p-panelmenu-header {
&.ocx-vertical-menu-active-item {
&:not(:focus-visible):not(:hover) {
> .p-panelmenu-header-content {
.p-panelmenu-header-action {
&:not(:hover):not(:focus) {
background-color: var(--menu-active-item-bg-color);
color: var(--menu-active-item-text-color);
}
}
}
}
}
}
.p-panelmenu-content {
.p-menuitem {
&.ocx-vertical-menu-active-item {
&:not(.p-focus) {
> .p-menuitem-content {
&:not(:hover) {
.p-menuitem-link {
background-color: var(--menu-active-item-bg-color);
color: var(--menu-active-item-text-color);
.p-menuitem-icon {
color: var(--menu-active-item-text-color);
}
.p-menuitem-text {
color: var(--menu-active-item-text-color);
}
}
}
}
}
}
}
}
}
}
2 changes: 1 addition & 1 deletion src/app/remotes/vertical-main-menu/vertical-main-menu.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
<p-panelMenu multiple="true" [model]="(menuItems$ | async) ?? []"></p-panelMenu>
<p-panelMenu multiple="true" [model]="(menuItems$ | async)?.items ?? []"></p-panelMenu>
252 changes: 251 additions & 1 deletion src/app/remotes/vertical-main-menu/vertical-main-menu.component.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,14 @@ describe('OneCXVerticalMainMenuComponent', () => {
)

const { fixture, component } = setUp()
spyOn(component.eventsTopic$, 'asObservable').and.returnValue(
of({
type: 'navigated',
payload: {
url: 'page-url'
}
})
)
await component.ngOnInit()

const menu = await TestbedHarnessEnvironment.harnessForFixture(fixture, PPanelMenuHarness)
Expand Down Expand Up @@ -183,6 +191,14 @@ describe('OneCXVerticalMainMenuComponent', () => {
)

const { fixture, component } = setUp()
spyOn(component.eventsTopic$, 'asObservable').and.returnValue(
of({
type: 'navigated',
payload: {
url: 'page-url'
}
})
)
await component.ngOnInit()

const menu = await TestbedHarnessEnvironment.harnessForFixture(fixture, PPanelMenuHarness)
Expand Down Expand Up @@ -224,6 +240,14 @@ describe('OneCXVerticalMainMenuComponent', () => {
)

const { fixture, component } = setUp()
spyOn(component.eventsTopic$, 'asObservable').and.returnValue(
of({
type: 'navigated',
payload: {
url: 'page-url'
}
})
)
await component.ngOnInit()

const menu = await TestbedHarnessEnvironment.harnessForFixture(fixture, PPanelMenuHarness)
Expand Down Expand Up @@ -265,6 +289,14 @@ describe('OneCXVerticalMainMenuComponent', () => {
const router = TestBed.inject(Router)

const { fixture, component } = setUp()
spyOn(component.eventsTopic$, 'asObservable').and.returnValue(
of({
type: 'navigated',
payload: {
url: 'page-url'
}
})
)
await component.ngOnInit()

const menu = await TestbedHarnessEnvironment.harnessForFixture(fixture, PPanelMenuHarness)
Expand Down Expand Up @@ -305,6 +337,14 @@ describe('OneCXVerticalMainMenuComponent', () => {
)

const { fixture, component } = setUp()
spyOn(component.eventsTopic$, 'asObservable').and.returnValue(
of({
type: 'navigated',
payload: {
url: 'page-url'
}
})
)
await component.ngOnInit()

const menu = await TestbedHarnessEnvironment.harnessForFixture(fixture, PPanelMenuHarness)
Expand Down Expand Up @@ -341,7 +381,7 @@ describe('OneCXVerticalMainMenuComponent', () => {
{
key: 'CORE_AH_MGMT',
name: 'Announcement & Help',
url: '',
url: 'page-url',
position: 1,
external: false,
i18n: {},
Expand Down Expand Up @@ -373,6 +413,14 @@ describe('OneCXVerticalMainMenuComponent', () => {
)

const { fixture, component } = setUp()
spyOn(component.eventsTopic$, 'asObservable').and.returnValue(
of({
type: 'navigated',
payload: {
url: 'page-url'
}
})
)
await component.ngOnInit()

const menu = await TestbedHarnessEnvironment.harnessForFixture(fixture, PPanelMenuHarness)
Expand All @@ -388,6 +436,208 @@ describe('OneCXVerticalMainMenuComponent', () => {
expect((await secondItemChildren[1].getChildren()).length).toBe(0)
})

describe('on router changes', () => {
const baseItems = [
{
key: 'PORTAL_MAIN_MENU',
name: 'Main Menu',
children: [
{
key: 'CORE_WELCOME',
name: 'Welcome Page',
url: '/admin/welcome',
position: 0,
external: false,
i18n: {},
children: []
},
{
key: 'CORE_AH_MGMT',
name: 'Announcement & Help',
url: 'page-url',
position: 1,
external: false,
i18n: {},
children: [
{
key: 'CORE_AH_MGMT_A',
name: 'Announcements',
url: '/admin/announcement',
position: 1,
external: false,
i18n: {},
children: []
},
{
key: 'CORE_AH_MGMT_HI',
name: 'Help Items',
url: '/admin/help',
position: 2,
external: false,
i18n: {},
children: []
}
]
}
]
}
]

it('should expand active item parents', async () => {
const appStateService = TestBed.inject(AppStateService)
spyOn(appStateService.currentWorkspace$, 'asObservable').and.returnValue(
of({
workspaceName: 'test-workspace'
}) as any
)
spyOn(appStateService.currentMfe$, 'asObservable').and.returnValue(of({} as any))
menuItemApiSpy.getMenuItems.and.returnValue(
of({
workspaceName: 'test-workspace',
menu: baseItems
} as any)
)

const { fixture, component } = setUp()
spyOn(component.eventsTopic$, 'asObservable').and.returnValue(
of({
type: 'navigated',
payload: {
url: '/admin/help'
}
})
)
await component.ngOnInit()

const menu = await TestbedHarnessEnvironment.harnessForFixture(fixture, PPanelMenuHarness)
const panels = await menu.getAllPanels()
expect(panels.length).toEqual(2)

expect((await panels[0].getChildren()).length).toBe(0)
const secondItemChildren = await panels[1].getChildren()
expect(secondItemChildren.length).toBe(2)
expect(await secondItemChildren[0].getText()).toEqual('Announcements')
expect(await (await secondItemChildren[0].host()).hasClass(component.activeItemClass)).toBeFalse()
expect(await secondItemChildren[1].getText()).toEqual('Help Items')
expect(await (await secondItemChildren[1].host()).hasClass(component.activeItemClass)).toBeTrue()

const menuItems = component.menuItems$.getValue()
expect(menuItems?.items.length).toBe(2)
expect(menuItems?.items[0].expanded).toBeFalsy()
expect(menuItems?.items[1].expanded).toBeTrue()
})

it('should update items if workspace did not change', async () => {
const appStateService = TestBed.inject(AppStateService)
spyOn(appStateService.currentWorkspace$, 'asObservable').and.returnValue(
of({
workspaceName: 'test-workspace'
}) as any
)
spyOn(appStateService.currentMfe$, 'asObservable').and.returnValue(of({} as any))
menuItemApiSpy.getMenuItems.and.returnValue(
of({
workspaceName: 'test-workspace',
menu: [
{
key: 'my-item',
name: 'item-name-1',
url: '/admin/help',
position: 2,
external: false,
i18n: {},
children: []
}
]
} as any)
)

const { component } = setUp()
spyOn(component.eventsTopic$, 'asObservable').and.returnValue(
of({
type: 'navigated',
payload: {
url: '/admin/help'
}
})
)
component.menuItems$.next({
workspaceName: 'test-workspace',
items: [
{
id: 'my-item',
items: undefined,
label: 'item-name-2',
routerLink: '/admin/help'
}
]
})
await component.ngOnInit()

const menuItems = component.menuItems$.getValue()
expect(menuItems?.items.length).toBe(1)
expect(menuItems?.items[0].label).toBe('item-name-2')
})

it('should overwrite items if workspace has changed', async () => {
const appStateService = TestBed.inject(AppStateService)
spyOn(appStateService.currentWorkspace$, 'asObservable').and.returnValue(
of({
workspaceName: 'other-workspace'
}) as any
)
spyOn(appStateService.currentMfe$, 'asObservable').and.returnValue(of({} as any))
menuItemApiSpy.getMenuItems.and.returnValue(
of({
workspaceName: 'other-workspace',
menu: [
{
key: 'PORTAL_MAIN_MENU',
name: 'Main Menu',
children: [
{
key: 'my-item',
name: 'item-name-1',
url: '/admin/help',
position: 2,
external: false,
i18n: {},
children: []
}
]
}
]
} as any)
)

const { component } = setUp()
spyOn(component.eventsTopic$, 'asObservable').and.returnValue(
of({
type: 'navigated',
payload: {
url: '/admin/help'
}
})
)
component.menuItems$.next({
workspaceName: 'test-workspace',
items: [
{
id: 'my-item',
items: undefined,
label: 'item-name-2',
routerLink: '/admin/help'
}
]
})
await component.ngOnInit()

const menuItems = component.menuItems$.getValue()
expect(menuItems?.items.length).toBe(1)
expect(menuItems?.items[0].label).toBe('item-name-1')
})
})

it('should return 0 panels when unable to load them', async () => {
const appStateService = TestBed.inject(AppStateService)
spyOn(appStateService.currentWorkspace$, 'asObservable').and.returnValue(
Expand Down
Loading
Loading