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

[CST-4880] use getPageInternalServerErrorRoute function to determinate 500 page route

Browse Source
This commit is contained in:
Giuseppe Digilio
2022-01-20 14:26:04 +01:00
parent fd610dbf4d
commit 98bdc59c28
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/app/root/root.component.ts
View File

@@ -1,5 +1,5 @@
import { map } from 'rxjs/operators'; import { map } from 'rxjs/operators';
import { Component, Inject, OnInit, Input } from '@angular/core'; import { Component, Inject, Input, OnInit } from '@angular/core';
import { Router } from '@angular/router'; import { Router } from '@angular/router';
import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs'; import { combineLatest as combineLatestObservable, Observable, of } from 'rxjs';
@@ -19,6 +19,7 @@ import { ThemeConfig } from '../../config/theme.model';
import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider'; import { Angulartics2DSpace } from '../statistics/angulartics/dspace-provider';
import { environment } from '../../environments/environment'; import { environment } from '../../environments/environment';
import { slideSidebarPadding } from '../shared/animations/slide'; import { slideSidebarPadding } from '../shared/animations/slide';
import { getPageInternalServerErrorRoute } from '../app-routing-paths';
@Component({ @Component({
selector: 'ds-root', selector: 'ds-root',
@@ -67,12 +68,12 @@ export class RootComponent implements OnInit {
this.totalSidebarWidth = this.cssService.getVariable('totalSidebarWidth'); this.totalSidebarWidth = this.cssService.getVariable('totalSidebarWidth');
const sidebarCollapsed = this.menuService.isMenuCollapsed(MenuID.ADMIN); const sidebarCollapsed = this.menuService.isMenuCollapsed(MenuID.ADMIN);
this.slideSidebarOver = combineLatestObservable(sidebarCollapsed, this.windowService.isXsOrSm()) this.slideSidebarOver = combineLatestObservable([sidebarCollapsed, this.windowService.isXsOrSm()])
.pipe( .pipe(
map(([collapsed, mobile]) => collapsed || mobile) map(([collapsed, mobile]) => collapsed || mobile)
); );
if (this.router.url === '/500') { if (this.router.url === getPageInternalServerErrorRoute()) {
this.shouldShowRouteLoader = false; this.shouldShowRouteLoader = false;
} }
} }