From a8544a7f32e31f6a0d38291d1a7cda94288f4277 Mon Sep 17 00:00:00 2001
From: Yura Bondarenko <yura.bondarenko@atmire.com>
Date: Thu, 25 Feb 2021 13:40:11 +0100
Subject: [PATCH] 77205: Remove access-control from admin routes

---
 src/app/+admin/admin-routing-paths.ts                      | 5 -----
 src/app/+admin/admin-routing.module.ts                     | 7 +------
 src/app/access-control/access-control-routing-paths.ts     | 6 +++++-
 .../resource-policies/resource-policies.component.ts       | 3 +--
 4 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/app/+admin/admin-routing-paths.ts b/src/app/+admin/admin-routing-paths.ts
index 11eac49fe2..3168ea93c9 100644
--- a/src/app/+admin/admin-routing-paths.ts
+++ b/src/app/+admin/admin-routing-paths.ts
@@ -2,12 +2,7 @@ import { URLCombiner } from '../core/url-combiner/url-combiner';
 import { getAdminModuleRoute } from '../app-routing-paths';
 
 export const REGISTRIES_MODULE_PATH = 'registries';
-export const ACCESS_CONTROL_MODULE_PATH = 'access-control';
 
 export function getRegistriesModuleRoute() {
   return new URLCombiner(getAdminModuleRoute(), REGISTRIES_MODULE_PATH).toString();
 }
-
-export function getAccessControlModuleRoute() {
-  return new URLCombiner(getAdminModuleRoute(), ACCESS_CONTROL_MODULE_PATH).toString();
-}
diff --git a/src/app/+admin/admin-routing.module.ts b/src/app/+admin/admin-routing.module.ts
index a5c844a118..ee5cb8737b 100644
--- a/src/app/+admin/admin-routing.module.ts
+++ b/src/app/+admin/admin-routing.module.ts
@@ -6,7 +6,7 @@ import { I18nBreadcrumbResolver } from '../core/breadcrumbs/i18n-breadcrumb.reso
 import { AdminWorkflowPageComponent } from './admin-workflow-page/admin-workflow-page.component';
 import { I18nBreadcrumbsService } from '../core/breadcrumbs/i18n-breadcrumbs.service';
 import { AdminCurationTasksComponent } from './admin-curation-tasks/admin-curation-tasks.component';
-import { ACCESS_CONTROL_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-routing-paths';
+import { REGISTRIES_MODULE_PATH } from './admin-routing-paths';
 
 @NgModule({
   imports: [
@@ -16,11 +16,6 @@ import { ACCESS_CONTROL_MODULE_PATH, REGISTRIES_MODULE_PATH } from './admin-rout
         loadChildren: () => import('./admin-registries/admin-registries.module')
           .then((m) => m.AdminRegistriesModule),
       },
-      {
-        path: ACCESS_CONTROL_MODULE_PATH,
-        loadChildren: () => import('../access-control/access-control.module')
-          .then((m) => m.AccessControlModule),
-      },
       {
         path: 'search',
         resolve: { breadcrumb: I18nBreadcrumbResolver },
diff --git a/src/app/access-control/access-control-routing-paths.ts b/src/app/access-control/access-control-routing-paths.ts
index 2a38a78015..10ef09066d 100644
--- a/src/app/access-control/access-control-routing-paths.ts
+++ b/src/app/access-control/access-control-routing-paths.ts
@@ -1,7 +1,11 @@
 import { URLCombiner } from '../core/url-combiner/url-combiner';
-import { getAccessControlModuleRoute } from '../+admin/admin-routing-paths';
 
 export const GROUP_EDIT_PATH = 'groups';
+export const ACCESS_CONTROL_MODULE_PATH = 'access-control';
+
+export function getAccessControlModuleRoute() {
+  return `/${ACCESS_CONTROL_MODULE_PATH}`;
+}
 
 export function getGroupEditRoute(id: string) {
   return new URLCombiner(getAccessControlModuleRoute(), GROUP_EDIT_PATH, id).toString();
diff --git a/src/app/shared/resource-policies/resource-policies.component.ts b/src/app/shared/resource-policies/resource-policies.component.ts
index 2b21d69d34..a83492d79f 100644
--- a/src/app/shared/resource-policies/resource-policies.component.ts
+++ b/src/app/shared/resource-policies/resource-policies.component.ts
@@ -32,8 +32,7 @@ import { NotificationsService } from '../notifications/notifications.service';
 import { dateToString, stringToNgbDateStruct } from '../date.util';
 import { followLink } from '../utils/follow-link-config.model';
 import { ADMIN_MODULE_PATH } from '../../app-routing-paths';
-import { GROUP_EDIT_PATH } from '../../access-control/access-control-routing-paths';
-import { ACCESS_CONTROL_MODULE_PATH } from '../../+admin/admin-routing-paths';
+import { ACCESS_CONTROL_MODULE_PATH, GROUP_EDIT_PATH } from '../../access-control/access-control-routing-paths';
 
 interface ResourcePolicyCheckboxEntry {
   id: string;