[DURACOM-234] rename guards in order to be complaint to function name convention

Author: atarix83

src/app/admin/admin-notifications/admin-notifications-routes.ts

@@ -1,6 +1,6 @@
 import { Route } from '@angular/router';
 
-import { AuthenticatedGuard } from '../../core/auth/authenticated.guard';
+import { authenticatedGuard } from '../../core/auth/authenticated.guard';
 import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { qualityAssuranceBreadcrumbResolver } from '../../core/breadcrumbs/quality-assurance-breadcrumb.resolver';
 import { AdminNotificationsPublicationClaimPageResolver } from '../../quality-assurance-notifications-pages/notifications-suggestion-targets-page/notifications-suggestion-targets-page-resolver.service';
@@ -19,7 +19,7 @@ import {
 
 export const ROUTES: Route[] = [
   {
-    canActivate: [ AuthenticatedGuard ],
+    canActivate: [ authenticatedGuard ],
     path: `${PUBLICATION_CLAIMS_PATH}`,
     component: AdminNotificationsPublicationClaimPageComponent,
     pathMatch: 'full',
@@ -34,7 +34,7 @@ export const ROUTES: Route[] = [
     },
   },
   {
-    canActivate: [AuthenticatedGuard],
+    canActivate: [authenticatedGuard],
     path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId`,
     component: QualityAssuranceTopicsPageComponent,
     pathMatch: 'full',
@@ -49,7 +49,7 @@ export const ROUTES: Route[] = [
     },
   },
   {
-    canActivate: [ AuthenticatedGuard ],
+    canActivate: [ authenticatedGuard ],
     path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/target/:targetId`,
     component: QualityAssuranceTopicsPageComponent,
     pathMatch: 'full',
@@ -64,7 +64,7 @@ export const ROUTES: Route[] = [
     },
   },
   {
-    canActivate: [AuthenticatedGuard],
+    canActivate: [authenticatedGuard],
     path: `${QUALITY_ASSURANCE_EDIT_PATH}`,
     component: QualityAssuranceSourcePageComponent,
     pathMatch: 'full',
@@ -80,7 +80,7 @@ export const ROUTES: Route[] = [
     },
   },
   {
-    canActivate: [AuthenticatedGuard],
+    canActivate: [authenticatedGuard],
     path: `${QUALITY_ASSURANCE_EDIT_PATH}/:sourceId/:topicId`,
     component: QualityAssuranceEventsPageComponent,
     pathMatch: 'full',

src/app/admin/admin-notify-dashboard/admin-notify-dashboard-routes.ts

@@ -4,15 +4,15 @@ import {
 } from '@angular/router';
 
 import { i18nBreadcrumbResolver } from '../../core/breadcrumbs/i18n-breadcrumb.resolver';
-import { NotifyInfoGuard } from '../../core/coar-notify/notify-info/notify-info.guard';
+import { notifyInfoGuard } from '../../core/coar-notify/notify-info/notify-info.guard';
 import { SiteAdministratorGuard } from '../../core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import { AdminNotifyDashboardComponent } from './admin-notify-dashboard.component';
 import { AdminNotifyIncomingComponent } from './admin-notify-logs/admin-notify-incoming/admin-notify-incoming.component';
 import { AdminNotifyOutgoingComponent } from './admin-notify-logs/admin-notify-outgoing/admin-notify-outgoing.component';
 
 export const ROUTES: Route[] = [
   {
-    canActivate: [...mapToCanActivate([SiteAdministratorGuard]), NotifyInfoGuard],
+    canActivate: [...mapToCanActivate([SiteAdministratorGuard]), notifyInfoGuard],
     path: '',
     resolve: {
       breadcrumb: i18nBreadcrumbResolver,
@@ -30,7 +30,7 @@ export const ROUTES: Route[] = [
       breadcrumb: i18nBreadcrumbResolver,
     },
     component: AdminNotifyIncomingComponent,
-    canActivate: [...mapToCanActivate([SiteAdministratorGuard]), NotifyInfoGuard],
+    canActivate: [...mapToCanActivate([SiteAdministratorGuard]), notifyInfoGuard],
     data: {
       title: 'admin.notify.dashboard.page.title',
       breadcrumbKey: 'admin.notify.dashboard',
@@ -42,7 +42,7 @@ export const ROUTES: Route[] = [
       breadcrumb: i18nBreadcrumbResolver,
     },
     component: AdminNotifyOutgoingComponent,
-    canActivate: [...mapToCanActivate([SiteAdministratorGuard]), NotifyInfoGuard],
+    canActivate: [...mapToCanActivate([SiteAdministratorGuard]), notifyInfoGuard],
     data: {
       title: 'admin.notify.dashboard.page.title',
       breadcrumbKey: 'admin.notify.dashboard',

src/app/app-routes.ts

@@ -24,13 +24,13 @@ import {
 } 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';
-import { AuthBlockingGuard } from './core/auth/auth-blocking.guard';
-import { AuthenticatedGuard } from './core/auth/authenticated.guard';
+import { authBlockingGuard } from './core/auth/auth-blocking.guard';
+import { authenticatedGuard } from './core/auth/authenticated.guard';
 import { GroupAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
 import { SiteAdministratorGuard } from './core/data/feature-authorization/feature-authorization-guard/site-administrator.guard';
 import { SiteRegisterGuard } from './core/data/feature-authorization/feature-authorization-guard/site-register.guard';
 import { EndUserAgreementCurrentUserGuard } from './core/end-user-agreement/end-user-agreement-current-user.guard';
-import { ReloadGuard } from './core/reload/reload.guard';
+import { reloadGuard } from './core/reload/reload.guard';
 import { ForgotPasswordCheckGuard } from './core/rest-property/forgot-password-check-guard.guard';
 import { ServerCheckGuard } from './core/server-check/server-check.guard';
 import { ThemedForbiddenComponent } from './forbidden/themed-forbidden.component';
@@ -49,7 +49,7 @@ export const APP_ROUTES: Route[] = [
   { path: ERROR_PAGE, component: ThemedPageErrorComponent },
   {
     path: '',
-    canActivate: [AuthBlockingGuard],
+    canActivate: [authBlockingGuard],
     canActivateChild: [ServerCheckGuard],
     resolve: [menuResolver],
     children: [
@@ -58,7 +58,7 @@ export const APP_ROUTES: Route[] = [
         path: 'reload/:rnd',
         component: ThemedPageNotFoundComponent,
         pathMatch: 'full',
-        canActivate: [ReloadGuard],
+        canActivate: [reloadGuard],
       },
       {
         path: 'home',
@@ -139,7 +139,7 @@ export const APP_ROUTES: Route[] = [
         loadChildren: () => import('./my-dspace-page/my-dspace-page-routes')
           .then((m) => m.ROUTES),
         providers: [provideSuggestionNotificationsState()],
-        canActivate: [AuthenticatedGuard, ...mapToCanActivate([EndUserAgreementCurrentUserGuard])],
+        canActivate: [authenticatedGuard, ...mapToCanActivate([EndUserAgreementCurrentUserGuard])],
       },
       {
         path: 'search',
@@ -164,7 +164,7 @@ export const APP_ROUTES: Route[] = [
         loadChildren: () => import('./quality-assurance-notifications-pages/notifications-pages-routes')
           .then((m) => m.ROUTES),
         providers: [provideSuggestionNotificationsState()],
-        canActivate: [AuthenticatedGuard, ...mapToCanActivate([EndUserAgreementCurrentUserGuard])],
+        canActivate: [authenticatedGuard, ...mapToCanActivate([EndUserAgreementCurrentUserGuard])],
       },
       {
         path: 'login',
@@ -208,20 +208,20 @@ export const APP_ROUTES: Route[] = [
         loadChildren: () => import('./profile-page/profile-page-routes')
           .then((m) => m.ROUTES),
         providers: [provideSuggestionNotificationsState()],
-        canActivate: [AuthenticatedGuard, ...mapToCanActivate([EndUserAgreementCurrentUserGuard])],
+        canActivate: [authenticatedGuard, ...mapToCanActivate([EndUserAgreementCurrentUserGuard])],
       },
       {
         path: PROCESS_MODULE_PATH,
         loadChildren: () => import('./process-page/process-page-routes')
           .then((m) => m.ROUTES),
-        canActivate: [AuthenticatedGuard, ...mapToCanActivate([EndUserAgreementCurrentUserGuard])],
+        canActivate: [authenticatedGuard, ...mapToCanActivate([EndUserAgreementCurrentUserGuard])],
       },
       {
         path: SUGGESTION_MODULE_PATH,
         loadChildren: () => import('./suggestions-page/suggestions-page-routes')
           .then((m) => m.ROUTES),
         providers: [provideSuggestionNotificationsState()],
-        canActivate: [AuthenticatedGuard, ...mapToCanActivate([EndUserAgreementCurrentUserGuard])],
+        canActivate: [authenticatedGuard, ...mapToCanActivate([EndUserAgreementCurrentUserGuard])],
       },
       {
         path: INFO_MODULE_PATH,
@@ -256,7 +256,7 @@ export const APP_ROUTES: Route[] = [
         path: 'subscriptions',
         loadChildren: () => import('./subscriptions-page/subscriptions-page-routes')
           .then((m) => m.ROUTES),
-        canActivate: [AuthenticatedGuard],
+        canActivate: [authenticatedGuard],
       },
       { path: '**', pathMatch: 'full', component: ThemedPageNotFoundComponent },
     ],

src/app/bitstream-page/bitstream-page-routes.ts

@@ -1,6 +1,6 @@
 import { Route } from '@angular/router';
 
-import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { authenticatedGuard } from '../core/auth/authenticated.guard';
 import { bitstreamBreadcrumbResolver } from '../core/breadcrumbs/bitstream-breadcrumb.resolver';
 import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ResourcePolicyCreateComponent } from '../shared/resource-policies/create/resource-policy-create.component';
@@ -51,7 +51,7 @@ export const ROUTES: Route[] = [
       bitstream: bitstreamPageResolver,
       breadcrumb: bitstreamBreadcrumbResolver,
     },
-    canActivate: [AuthenticatedGuard],
+    canActivate: [authenticatedGuard],
   },
   {
     path: EDIT_BITSTREAM_AUTHORIZATIONS_PATH,

src/app/browse-by/browse-by-guard.spec.ts

@@ -6,10 +6,10 @@ import {
   createSuccessfulRemoteDataObject$,
 } from '../shared/remote-data.utils';
 import { RouterStub } from '../shared/testing/router.stub';
-import { BrowseByGuard } from './browse-by-guard';
+import { browseByGuard } from './browse-by-guard';
 import { BrowseByDataType } from './browse-by-switcher/browse-by-data-type';
 
-describe('BrowseByGuard', () => {
+describe('browseByGuard', () => {
   describe('canActivate', () => {
     let guard: any;
     let translateService: any;
@@ -35,7 +35,7 @@ describe('BrowseByGuard', () => {
 
       router = new RouterStub() as any;
 
-      guard = BrowseByGuard;
+      guard = browseByGuard;
     });
 
     it('should return true, and sets up the data correctly, with a scope and value', () => {

src/app/browse-by/browse-by-guard.ts

@@ -26,7 +26,7 @@ import {
   hasValue,
 } from '../shared/empty.util';
 
-export const BrowseByGuard: CanActivateFn = (
+export const browseByGuard: CanActivateFn = (
   route: ActivatedRouteSnapshot,
   state: RouterStateSnapshot,
   browseDefinitionService: BrowseDefinitionDataService = inject(BrowseDefinitionDataService),

src/app/browse-by/browse-by-page-routes.ts

@@ -2,7 +2,7 @@ import { Route } from '@angular/router';
 
 import { dsoEditMenuResolver } from '../shared/dso-page/dso-edit-menu.resolver';
 import { browseByDSOBreadcrumbResolver } from './browse-by-dso-breadcrumb.resolver';
-import { BrowseByGuard } from './browse-by-guard';
+import { browseByGuard } from './browse-by-guard';
 import { browseByI18nBreadcrumbResolver } from './browse-by-i18n-breadcrumb.resolver';
 import { BrowseByPageComponent } from './browse-by-page/browse-by-page.component';
 
@@ -17,7 +17,7 @@ export const ROUTES: Route[] = [
       {
         path: ':id',
         component: BrowseByPageComponent,
-        canActivate: [BrowseByGuard],
+        canActivate: [browseByGuard],
         resolve: { breadcrumb: browseByI18nBreadcrumbResolver },
         data: { title: 'browse.title.page', breadcrumbKey: 'browse.metadata' },
       },

src/app/collection-page/collection-page-routes.ts

@@ -3,9 +3,9 @@ import {
   Route,
 } from '@angular/router';
 
-import { BrowseByGuard } from '../browse-by/browse-by-guard';
+import { browseByGuard } from '../browse-by/browse-by-guard';
 import { browseByI18nBreadcrumbResolver } from '../browse-by/browse-by-i18n-breadcrumb.resolver';
-import { AuthenticatedGuard } from '../core/auth/authenticated.guard';
+import { authenticatedGuard } from '../core/auth/authenticated.guard';
 import { collectionBreadcrumbResolver } from '../core/breadcrumbs/collection-breadcrumb.resolver';
 import { i18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { ComcolBrowseByComponent } from '../shared/comcol/sections/comcol-browse-by/comcol-browse-by.component';
@@ -21,7 +21,7 @@ import {
   ITEMTEMPLATE_PATH,
 } from './collection-page-routing-paths';
 import { CreateCollectionPageComponent } from './create-collection-page/create-collection-page.component';
-import { CreateCollectionPageGuard } from './create-collection-page/create-collection-page.guard';
+import { createCollectionPageGuard } from './create-collection-page/create-collection-page.guard';
 import { DeleteCollectionPageComponent } from './delete-collection-page/delete-collection-page.component';
 import { itemTemplatePageResolver } from './edit-item-template-page/item-template-page.resolver';
 import { ThemedEditItemTemplatePageComponent } from './edit-item-template-page/themed-edit-item-template-page.component';
@@ -32,7 +32,7 @@ export const ROUTES: Route[] = [
   {
     path: COLLECTION_CREATE_PATH,
     component: CreateCollectionPageComponent,
-    canActivate: [AuthenticatedGuard, CreateCollectionPageGuard],
+    canActivate: [authenticatedGuard, createCollectionPageGuard],
   },
   {
     path: ':id',
@@ -53,12 +53,12 @@ export const ROUTES: Route[] = [
         path: 'delete',
         pathMatch: 'full',
         component: DeleteCollectionPageComponent,
-        canActivate: [AuthenticatedGuard],
+        canActivate: [authenticatedGuard],
       },
       {
         path: ITEMTEMPLATE_PATH,
         component: ThemedEditItemTemplatePageComponent,
-        canActivate: [AuthenticatedGuard],
+        canActivate: [authenticatedGuard],
         resolve: {
           item: itemTemplatePageResolver,
           breadcrumb: i18nBreadcrumbResolver,
@@ -78,7 +78,7 @@ export const ROUTES: Route[] = [
             path: 'browse/:id',
             pathMatch: 'full',
             component: ComcolBrowseByComponent,
-            canActivate: [BrowseByGuard],
+            canActivate: [browseByGuard],
             resolve: {
               breadcrumb: browseByI18nBreadcrumbResolver,
             },

src/app/collection-page/create-collection-page/create-collection-page.guard.spec.ts

@@ -6,9 +6,9 @@ import {
   createFailedRemoteDataObject$,
   createSuccessfulRemoteDataObject$,
 } from '../../shared/remote-data.utils';
-import { CreateCollectionPageGuard } from './create-collection-page.guard';
+import { createCollectionPageGuard } from './create-collection-page.guard';
 
-describe('CreateCollectionPageGuard', () => {
+describe('createCollectionPageGuard', () => {
   describe('canActivate', () => {
     let guard: any;
     let router;
@@ -28,7 +28,7 @@ describe('CreateCollectionPageGuard', () => {
       };
       router = new RouterMock();
 
-      guard = CreateCollectionPageGuard;
+      guard = createCollectionPageGuard;
     });
 
     it('should return true when the parent ID resolves to a community', () => {

src/app/collection-page/create-collection-page/create-collection-page.guard.ts

@@ -27,7 +27,7 @@ import {
  * True when either a parent ID query parameter has been provided and the parent ID resolves to a valid parent community
  * Reroutes to a 404 page when the page cannot be activated
  */
-export const CreateCollectionPageGuard: CanActivateFn = (
+export const createCollectionPageGuard: CanActivateFn = (
   route: ActivatedRouteSnapshot,
   state: RouterStateSnapshot,
   communityService: CommunityDataService = inject(CommunityDataService),