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

68067: Fix adding/removing menu sections

Browse Source
This commit is contained in:
Kristof De Langhe
2020-05-19 11:11:07 +02:00
parent b28f59f087
commit 8b78ed3a97
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/shared/menu/menu.component.ts
View File

@@ -3,7 +3,7 @@ import { Observable } from 'rxjs/internal/Observable';
import { MenuService } from '../../shared/menu/menu.service'; import { MenuService } from '../../shared/menu/menu.service';
import { MenuID } from '../../shared/menu/initial-menus-state'; import { MenuID } from '../../shared/menu/initial-menus-state';
import { MenuSection } from '../../shared/menu/menu.reducer'; import { MenuSection } from '../../shared/menu/menu.reducer';
import { first, map } from 'rxjs/operators'; import { distinctUntilChanged, first, map } from 'rxjs/operators';
import { GenericConstructor } from '../../core/shared/generic-constructor'; import { GenericConstructor } from '../../core/shared/generic-constructor';
import { hasValue } from '../empty.util'; import { hasValue } from '../empty.util';
import { MenuSectionComponent } from './menu-section/menu-section.component'; import { MenuSectionComponent } from './menu-section/menu-section.component';
@@ -72,7 +72,7 @@ export class MenuComponent implements OnInit {
this.menuCollapsed = this.menuService.isMenuCollapsed(this.menuID); this.menuCollapsed = this.menuService.isMenuCollapsed(this.menuID);
this.menuPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this.menuID); this.menuPreviewCollapsed = this.menuService.isMenuPreviewCollapsed(this.menuID);
this.menuVisible = this.menuService.isMenuVisible(this.menuID); this.menuVisible = this.menuService.isMenuVisible(this.menuID);
this.sections = this.menuService.getMenuTopSections(this.menuID).pipe(first()); this.sections = this.menuService.getMenuTopSections(this.menuID).pipe(distinctUntilChanged((x, y) => x.length === y.length));
this.sections.subscribe((sections: MenuSection[]) => { this.sections.subscribe((sections: MenuSection[]) => {
sections.forEach((section: MenuSection) => { sections.forEach((section: MenuSection) => {
this.sectionInjectors.set(section.id, this.getSectionDataInjector(section)); this.sectionInjectors.set(section.id, this.getSectionDataInjector(section));

4
src/app/shared/menu/menu.reducer.ts
View File

@@ -176,7 +176,9 @@ function removeSection(state: MenusState, action: RemoveMenuSectionAction) {
const menuState: MenuState = state[action.menuID]; const menuState: MenuState = state[action.menuID];
const id = action.id; const id = action.id;
const newState = removeFromIndex(state, menuState.sections[action.id], action.menuID); const newState = removeFromIndex(state, menuState.sections[action.id], action.menuID);
const newMenuState = Object.assign({}, newState[action.menuID]); const newMenuState = Object.assign({}, newState[action.menuID], {
sections: Object.assign({}, newState[action.menuID].sections)
});
delete newMenuState.sections[id]; delete newMenuState.sections[id];
return Object.assign({}, newState, { [action.menuID]: newMenuState }); return Object.assign({}, newState, { [action.menuID]: newMenuState });
} }