hazza/dspace-angular
1
0
Fork 1
mirror of https://github.com/DSpace/dspace-angular.git synced 2025-10-18 15:33:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'refactor-menu-resolvers-7.6' into refactor-menu-resolvers-9.0

Browse Source
This commit is contained in:
Yana De Pauw
2025-02-21 13:36:23 +01:00
parent 174d185de3 bb02acf13e
commit 4a2158a178
6 changed files with 22 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/shared/menu/menu-provider.model.ts
View File

@@ -23,6 +23,7 @@ import { MenuItemModels } from './menu-section.model';
*/ */
export interface PartialMenuSection { export interface PartialMenuSection {
id?: string; id?: string;
accessibilityHandle?: string;
visible: boolean; visible: boolean;
model: MenuItemModels; model: MenuItemModels;
parentID?: string; parentID?: string;

5
src/app/shared/menu/menu-section.model.ts
View File

@@ -19,6 +19,11 @@ export interface MenuSection {
*/ */
id: string; id: string;
/**
* Accessibility handle that can be used to find a specific menu in the html
*/
accessibilityHandle?: string;
/** /**
* Whether this section should be visible. * Whether this section should be visible.
*/ */

6
src/app/shared/menu/menu.structure.ts
View File

@@ -94,7 +94,11 @@ function addProviderToList(providers: Provider[], providerType: Type<AbstractMen
provider.index = provider.index ?? index; provider.index = provider.index ?? index;
if (hasValue(parentID)) { if (hasValue(parentID)) {
provider.menuProviderId = provider.menuProviderId ?? `${parentID}_${index}`; provider.menuProviderId = provider.menuProviderId ?? `${parentID}_${index}`;
provider.parentID = provider.parentID ?? parentID; let providerParentID = provider.parentID;
if (hasValue(providerParentID)) {
providerParentID = `${providerParentID}_0`;
}
provider.parentID = providerParentID ?? parentID;
} else { } else {
provider.menuProviderId = provider.menuProviderId ?? `${menuID}_${index}`; provider.menuProviderId = provider.menuProviderId ?? `${menuID}_${index}`;
} }

10
src/app/shared/menu/providers/helper-providers/expandable-menu-provider.spec.ts
View File

@@ -62,8 +62,8 @@ describe('AbstractExpandableMenuProvider', () => {
type: MenuItemType.TEXT, type: MenuItemType.TEXT,
text: 'sub.section.test.1', text: 'sub.section.test.1',
}, },
id: `${MenuID.ADMIN}_1_0`, id: `${MenuID.ADMIN}_1_0_0`,
parentID: `${MenuID.ADMIN}_1`, parentID: `${MenuID.ADMIN}_1_0`,
alwaysRenderExpandable: false, alwaysRenderExpandable: false,
}, },
{ {
@@ -72,8 +72,8 @@ describe('AbstractExpandableMenuProvider', () => {
type: MenuItemType.TEXT, type: MenuItemType.TEXT,
text: 'sub.section.test.2', text: 'sub.section.test.2',
}, },
id: `${MenuID.ADMIN}_1_1`, id: `${MenuID.ADMIN}_1_0_1`,
parentID: `${MenuID.ADMIN}_1`, parentID: `${MenuID.ADMIN}_1_0`,
alwaysRenderExpandable: false, alwaysRenderExpandable: false,
}, },
{ {
@@ -83,7 +83,7 @@ describe('AbstractExpandableMenuProvider', () => {
text: 'top.section.test', text: 'top.section.test',
}, },
icon: 'file-import', icon: 'file-import',
id: `${MenuID.ADMIN}_1`, id: `${MenuID.ADMIN}_1_0`,
alwaysRenderExpandable: true, alwaysRenderExpandable: true,
}, },
]; ];

9
src/app/shared/menu/providers/helper-providers/expandable-menu-provider.ts
View File

@@ -45,11 +45,12 @@ export abstract class AbstractExpandableMenuProvider extends AbstractMenuProvide
map(( map((
[partialTopSection, partialSubSections]: [PartialMenuSection, PartialMenuSection[]], [partialTopSection, partialSubSections]: [PartialMenuSection, PartialMenuSection[]],
) => { ) => {
const parentID = partialTopSection.id ?? this.getAutomatedSectionIdForTopSection();
const subSections = partialSubSections.map((partialSub, index) => { const subSections = partialSubSections.map((partialSub, index) => {
return { return {
...partialSub, ...partialSub,
id: partialSub.id ?? `${this.menuProviderId}_${index}`, id: partialSub.id ?? this.getAutomatedSectionIdForSubsection(index),
parentID: this.menuProviderId, parentID: parentID,
alwaysRenderExpandable: false, alwaysRenderExpandable: false,
}; };
}); });
@@ -58,7 +59,7 @@ export abstract class AbstractExpandableMenuProvider extends AbstractMenuProvide
...subSections, ...subSections,
{ {
...partialTopSection, ...partialTopSection,
id: this.menuProviderId, id: parentID,
alwaysRenderExpandable: this.alwaysRenderExpandable, alwaysRenderExpandable: this.alwaysRenderExpandable,
}, },
]; ];
@@ -70,7 +71,7 @@ export abstract class AbstractExpandableMenuProvider extends AbstractMenuProvide
return this.getAutomatedSectionId(0); return this.getAutomatedSectionId(0);
} }
protected getAutomatedSectionIdForSubsection(indexOfSubSectionInProvider: number): string { protected getAutomatedSectionIdForSubsection(indexOfSubSectionInProvider: number): string {
return `${this.menuProviderId}_0_${indexOfSubSectionInProvider}`; return `${this.getAutomatedSectionIdForTopSection()}_${indexOfSubSectionInProvider}`;
} }
} }

2
src/app/shared/menu/providers/helper-providers/route-context.menu.spec.ts
View File

@@ -22,7 +22,7 @@ import { MenuItemType } from '../../menu-item-type.model';
import { PartialMenuSection } from '../../menu-provider.model'; import { PartialMenuSection } from '../../menu-provider.model';
import { AbstractRouteContextMenuProvider } from './route-context.menu'; import { AbstractRouteContextMenuProvider } from './route-context.menu';
describe('AbstractExpandableMenuProvider', () => { describe('AbstractRouteContextMenuProvider', () => {
class TestClass extends AbstractRouteContextMenuProvider<CacheableObject> { class TestClass extends AbstractRouteContextMenuProvider<CacheableObject> {
getRouteContext(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<CacheableObject> { getRouteContext(route: ActivatedRouteSnapshot, state: RouterStateSnapshot): Observable<CacheableObject> {