Merge pull request DSpace#1493 from DSpace/revert-1407-DSC-287-Show-an-error-page-if-the-REST-API-is-not-available

Revert "Show an error page if the rest api is not available"

Author: tdonohue

src/app/app-routing-paths.ts

@@ -89,12 +89,6 @@ export function getPageNotFoundRoute() {
   return `/${PAGE_NOT_FOUND_PATH}`;
 }
 
-export const INTERNAL_SERVER_ERROR = '500';
-
-export function getPageInternalServerErrorRoute() {
-  return `/${INTERNAL_SERVER_ERROR}`;
-}
-
 export const INFO_MODULE_PATH = 'info';
 export function getInfoModulePath() {
   return `/${INFO_MODULE_PATH}`;

src/app/app-routing.module.ts

@@ -11,12 +11,10 @@ import {
   FORBIDDEN_PATH,
   FORGOT_PASSWORD_PATH,
   INFO_MODULE_PATH,
-  INTERNAL_SERVER_ERROR,
-  LEGACY_BITSTREAM_MODULE_PATH,
   PROFILE_MODULE_PATH,
   REGISTER_PATH,
-  REQUEST_COPY_MODULE_PATH,
   WORKFLOW_ITEM_MODULE_PATH,
+  LEGACY_BITSTREAM_MODULE_PATH, REQUEST_COPY_MODULE_PATH,
 } from './app-routing-paths';
 import { COLLECTION_MODULE_PATH } from './collection-page/collection-page-routing-paths';
 import { COMMUNITY_MODULE_PATH } from './community-page/community-page-routing-paths';
@@ -28,25 +26,14 @@ import { SiteRegisterGuard } from './core/data/feature-authorization/feature-aut
 import { ThemedPageNotFoundComponent } from './pagenotfound/themed-pagenotfound.component';
 import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
 import { GroupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
-import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
-import { ServerCheckGuard } from './core/server-check/server-check.guard';
 
 @NgModule({
   imports: [
-    RouterModule.forRoot([
-      { path: INTERNAL_SERVER_ERROR, component: ThemedPageInternalServerErrorComponent },
-      {
-        path: '',
-        canActivate: [AuthBlockingGuard],
-        canActivateChild: [ServerCheckGuard],
+    RouterModule.forRoot([{
+      path: '', canActivate: [AuthBlockingGuard],
         children: [
           { path: '', redirectTo: '/home', pathMatch: 'full' },
-          {
-            path: 'reload/:rnd',
-            component: ThemedPageNotFoundComponent,
-            pathMatch: 'full',
-            canActivate: [ReloadGuard]
-          },
+          { path: 'reload/:rnd', component: ThemedPageNotFoundComponent, pathMatch: 'full', canActivate: [ReloadGuard] },
           {
             path: 'home',
             loadChildren: () => import('./home-page/home-page.module')
@@ -102,8 +89,7 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
               .then((m) => m.ItemPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
           },
-          {
-            path: 'entities/:entity-type',
+          { path: 'entities/:entity-type',
             loadChildren: () => import('./item-page/item-page.module')
               .then((m) => m.ItemPageModule),
             canActivate: [EndUserAgreementCurrentUserGuard]
@@ -147,12 +133,12 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
           {
             path: 'login',
             loadChildren: () => import('./login-page/login-page.module')
-              .then((m) => m.LoginPageModule)
+              .then((m) => m.LoginPageModule),
           },
           {
             path: 'logout',
             loadChildren: () => import('./logout-page/logout-page.module')
-              .then((m) => m.LogoutPageModule)
+              .then((m) => m.LogoutPageModule),
           },
           {
             path: 'submit',
@@ -192,7 +178,7 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
           },
           {
             path: INFO_MODULE_PATH,
-            loadChildren: () => import('./info/info.module').then((m) => m.InfoModule)
+            loadChildren: () => import('./info/info.module').then((m) => m.InfoModule),
           },
           {
             path: REQUEST_COPY_MODULE_PATH,
@@ -206,18 +192,17 @@ import { ServerCheckGuard } from './core/server-check/server-check.guard';
           {
             path: 'statistics',
             loadChildren: () => import('./statistics-page/statistics-page-routing.module')
-              .then((m) => m.StatisticsPageRoutingModule)
+              .then((m) => m.StatisticsPageRoutingModule),
           },
           {
             path: ACCESS_CONTROL_MODULE_PATH,
             loadChildren: () => import('./access-control/access-control.module').then((m) => m.AccessControlModule),
             canActivate: [GroupAdministratorGuard],
           },
           { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent },
-        ]
-      }
-    ], {
-      onSameUrlNavigation: 'reload',
+      ]}
+    ],{
+    onSameUrlNavigation: 'reload',
 })
   ],
   exports: [RouterModule],

src/app/app.module.ts

@@ -54,8 +54,6 @@ import { ThemedFooterComponent } from './footer/themed-footer.component';
 import { ThemedBreadcrumbsComponent } from './breadcrumbs/themed-breadcrumbs.component';
 import { ThemedHeaderNavbarWrapperComponent } from './header-nav-wrapper/themed-header-navbar-wrapper.component';
 import { IdleModalComponent } from './shared/idle-modal/idle-modal.component';
-import { ThemedPageInternalServerErrorComponent } from './page-internal-server-error/themed-page-internal-server-error.component';
-import { PageInternalServerErrorComponent } from './page-internal-server-error/page-internal-server-error.component';
 
 import { AppConfig, APP_CONFIG } from '../config/app-config.interface';
 
@@ -183,9 +181,7 @@ const DECLARATIONS = [
   ThemedBreadcrumbsComponent,
   ForbiddenComponent,
   ThemedForbiddenComponent,
-  IdleModalComponent,
-  ThemedPageInternalServerErrorComponent,
-  PageInternalServerErrorComponent
+  IdleModalComponent
 ];
 
 const EXPORTS = [

src/app/core/data/root-data.service.ts

@@ -106,12 +106,5 @@ export class RootDataService {
   findAllByHref(href: string | Observable<string>, findListOptions: FindListOptions = {}, useCachedVersionIfAvailable = true, reRequestOnStale = true, ...linksToFollow: FollowLinkConfig<Root>[]): Observable<RemoteData<PaginatedList<Root>>> {
     return this.dataService.findAllByHref(href, findListOptions, useCachedVersionIfAvailable, reRequestOnStale, ...linksToFollow);
   }
-
-  /**
-   * Set to sale the root endpoint cache hit
-   */
-  invalidateRootCache() {
-    this.requestService.setStaleByHrefSubstring('server/api');
-  }
 }
 /* tslint:enable:max-classes-per-file */

src/app/core/server-check/server-check.guard.spec.ts

@@ -31,8 +31,4 @@ export class ServerResponseService {
   setNotFound(message = 'Not found'): this {
     return this.setStatus(404, message);
   }
-
-  setInternalServerError(message = 'Internal Server Error'): this {
-    return this.setStatus(500, message);
-  }
 }