From 44c608c4451f77111642f3fc94c607092d6c06bf Mon Sep 17 00:00:00 2001
From: Giuseppe Digilio <giuseppe.digilio@4science.com>
Date: Wed, 13 Mar 2024 12:28:27 +0100
Subject: [PATCH] [DURACOM-191] Remove access-control.module

---
 .../access-control/access-control-routes.ts   | 30 ++++++++-
 .../access-control/access-control.module.ts   | 63 -------------------
 2 files changed, 29 insertions(+), 64 deletions(-)
 delete mode 100644 src/app/access-control/access-control.module.ts

diff --git a/src/app/access-control/access-control-routes.ts b/src/app/access-control/access-control-routes.ts
index 6dab471c40..dfa62ec4cd 100644
--- a/src/app/access-control/access-control-routes.ts
+++ b/src/app/access-control/access-control-routes.ts
@@ -1,4 +1,9 @@
+import { AbstractControl } from '@angular/forms';
 import { Route } from '@angular/router';
+import {
+  DYNAMIC_ERROR_MESSAGES_MATCHER,
+  DynamicErrorMessagesMatcher,
+} from '@ng-dynamic-forms/core';
 
 import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.resolver';
 import { GroupAdministratorGuard } from '../core/data/feature-authorization/feature-authorization-guard/group-administrator.guard';
@@ -15,6 +20,20 @@ import { GroupFormComponent } from './group-registry/group-form/group-form.compo
 import { GroupPageGuard } from './group-registry/group-page.guard';
 import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
 
+/**
+ * Condition for displaying error messages on email form field
+ */
+export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
+  (control: AbstractControl, model: any, hasFocus: boolean) => {
+    return (control.touched && !hasFocus) || (control.errors?.emailTaken && hasFocus);
+  };
+
+const providers = [
+  {
+    provide: DYNAMIC_ERROR_MESSAGES_MATCHER,
+    useValue: ValidateEmailErrorStateMatcher,
+  },
+];
 export const ROUTES: Route[] = [
   {
     path: EPERSON_PATH,
@@ -22,6 +41,7 @@ export const ROUTES: Route[] = [
     resolve: {
       breadcrumb: I18nBreadcrumbResolver,
     },
+    providers,
     data: { title: 'admin.access-control.epeople.title', breadcrumbKey: 'admin.access-control.epeople' },
     canActivate: [SiteAdministratorGuard],
   },
@@ -31,6 +51,7 @@ export const ROUTES: Route[] = [
     resolve: {
       breadcrumb: I18nBreadcrumbResolver,
     },
+    providers,
     data: { title: 'admin.access-control.epeople.add.title', breadcrumbKey: 'admin.access-control.epeople.add' },
     canActivate: [SiteAdministratorGuard],
   },
@@ -41,6 +62,7 @@ export const ROUTES: Route[] = [
       breadcrumb: I18nBreadcrumbResolver,
       ePerson: EPersonResolver,
     },
+    providers,
     data: { title: 'admin.access-control.epeople.edit.title', breadcrumbKey: 'admin.access-control.epeople.edit' },
     canActivate: [SiteAdministratorGuard],
   },
@@ -50,6 +72,7 @@ export const ROUTES: Route[] = [
     resolve: {
       breadcrumb: I18nBreadcrumbResolver,
     },
+    providers,
     data: { title: 'admin.access-control.groups.title', breadcrumbKey: 'admin.access-control.groups' },
     canActivate: [GroupAdministratorGuard],
   },
@@ -59,7 +82,11 @@ export const ROUTES: Route[] = [
     resolve: {
       breadcrumb: I18nBreadcrumbResolver,
     },
-    data: { title: 'admin.access-control.groups.title.addGroup', breadcrumbKey: 'admin.access-control.groups.addGroup' },
+    providers,
+    data: {
+      title: 'admin.access-control.groups.title.addGroup',
+      breadcrumbKey: 'admin.access-control.groups.addGroup',
+    },
     canActivate: [GroupAdministratorGuard],
   },
   {
@@ -68,6 +95,7 @@ export const ROUTES: Route[] = [
     resolve: {
       breadcrumb: I18nBreadcrumbResolver,
     },
+    providers,
     data: {
       title: 'admin.access-control.groups.title.singleGroup',
       breadcrumbKey: 'admin.access-control.groups.singleGroup',
diff --git a/src/app/access-control/access-control.module.ts b/src/app/access-control/access-control.module.ts
deleted file mode 100644
index ba854aa158..0000000000
--- a/src/app/access-control/access-control.module.ts
+++ /dev/null
@@ -1,63 +0,0 @@
-import { CommonModule } from '@angular/common';
-import { NgModule } from '@angular/core';
-import { AbstractControl } from '@angular/forms';
-import { RouterModule } from '@angular/router';
-import { NgbAccordionModule } from '@ng-bootstrap/ng-bootstrap';
-import {
-  DYNAMIC_ERROR_MESSAGES_MATCHER,
-  DynamicErrorMessagesMatcher,
-} from '@ng-dynamic-forms/core';
-
-import { FormModule } from '../shared/form/form.module';
-import { SearchModule } from '../shared/search/search.module';
-import { BulkAccessBrowseComponent } from './bulk-access/browse/bulk-access-browse.component';
-import { BulkAccessComponent } from './bulk-access/bulk-access.component';
-import { BulkAccessSettingsComponent } from './bulk-access/settings/bulk-access-settings.component';
-import { EPeopleRegistryComponent } from './epeople-registry/epeople-registry.component';
-import { EPersonFormComponent } from './epeople-registry/eperson-form/eperson-form.component';
-import { GroupFormComponent } from './group-registry/group-form/group-form.component';
-import { MembersListComponent } from './group-registry/group-form/members-list/members-list.component';
-import { SubgroupsListComponent } from './group-registry/group-form/subgroup-list/subgroups-list.component';
-import { GroupsRegistryComponent } from './group-registry/groups-registry.component';
-
-/**
- * Condition for displaying error messages on email form field
- */
-export const ValidateEmailErrorStateMatcher: DynamicErrorMessagesMatcher =
-  (control: AbstractControl, model: any, hasFocus: boolean) => {
-    return (control.touched && !hasFocus) || (control.errors?.emailTaken && hasFocus);
-  };
-
-@NgModule({
-  imports: [
-    CommonModule,
-    RouterModule,
-    FormModule,
-    NgbAccordionModule,
-    SearchModule,
-    EPeopleRegistryComponent,
-    EPersonFormComponent,
-    GroupsRegistryComponent,
-    GroupFormComponent,
-    SubgroupsListComponent,
-    MembersListComponent,
-    BulkAccessComponent,
-    BulkAccessBrowseComponent,
-    BulkAccessSettingsComponent,
-  ],
-  exports: [
-    MembersListComponent,
-  ],
-  providers: [
-    {
-      provide: DYNAMIC_ERROR_MESSAGES_MATCHER,
-      useValue: ValidateEmailErrorStateMatcher,
-    },
-  ],
-})
-/**
- * This module handles all components related to the access control pages
- */
-export class AccessControlModule {
-
-}