From c7b5d0d2f8ec96d60db7a7c8f85ed8cb73b9b02d Mon Sep 17 00:00:00 2001 From: grossmj Date: Fri, 6 Oct 2023 18:02:57 +1000 Subject: [PATCH] Rename ACE management component to ACL --- src/app/app-routing.module.ts | 18 +++++++++--------- src/app/app.module.ts | 14 +++++++------- .../acl-management.component.html} | 0 .../acl-management.component.scss} | 0 .../acl-management.component.spec.ts} | 12 ++++++------ .../acl-management.component.ts} | 12 ++++++------ .../add-ace-dialog/EndpointTreeAdapter.spec.ts | 2 +- .../add-ace-dialog/EndpointTreeAdapter.ts | 0 .../add-ace-dialog.component.html | 0 .../add-ace-dialog.component.scss | 0 .../add-ace-dialog.component.spec.ts | 0 .../add-ace-dialog/add-ace-dialog.component.ts | 2 +- .../autocomplete/autocomplete.component.html | 0 .../autocomplete/autocomplete.component.scss | 0 .../autocomplete.component.spec.ts | 0 .../autocomplete/autocomplete.component.ts | 0 .../delete-ace-dialog.component.html | 0 .../delete-ace-dialog.component.scss | 0 .../delete-ace-dialog.component.spec.ts | 0 .../delete-ace-dialog.component.ts | 0 .../group-details/group-details.component.html | 2 +- .../management/management.component.ts | 2 +- .../user-detail/user-detail.component.html | 2 +- 23 files changed, 33 insertions(+), 33 deletions(-) rename src/app/components/{ace-management/ace-management.component.html => acl-management/acl-management.component.html} (100%) rename src/app/components/{ace-management/ace-management.component.scss => acl-management/acl-management.component.scss} (100%) rename src/app/components/{ace-management/ace-management.component.spec.ts => acl-management/acl-management.component.spec.ts} (51%) rename src/app/components/{ace-management/ace-management.component.ts => acl-management/acl-management.component.ts} (94%) rename src/app/components/{ace-management => acl-management}/add-ace-dialog/EndpointTreeAdapter.spec.ts (96%) rename src/app/components/{ace-management => acl-management}/add-ace-dialog/EndpointTreeAdapter.ts (100%) rename src/app/components/{ace-management => acl-management}/add-ace-dialog/add-ace-dialog.component.html (100%) rename src/app/components/{ace-management => acl-management}/add-ace-dialog/add-ace-dialog.component.scss (100%) rename src/app/components/{ace-management => acl-management}/add-ace-dialog/add-ace-dialog.component.spec.ts (100%) rename src/app/components/{ace-management => acl-management}/add-ace-dialog/add-ace-dialog.component.ts (98%) rename src/app/components/{ace-management => acl-management}/add-ace-dialog/autocomplete/autocomplete.component.html (100%) rename src/app/components/{ace-management => acl-management}/add-ace-dialog/autocomplete/autocomplete.component.scss (100%) rename src/app/components/{ace-management => acl-management}/add-ace-dialog/autocomplete/autocomplete.component.spec.ts (100%) rename src/app/components/{ace-management => acl-management}/add-ace-dialog/autocomplete/autocomplete.component.ts (100%) rename src/app/components/{ace-management => acl-management}/delete-ace-dialog/delete-ace-dialog.component.html (100%) rename src/app/components/{ace-management => acl-management}/delete-ace-dialog/delete-ace-dialog.component.scss (100%) rename src/app/components/{ace-management => acl-management}/delete-ace-dialog/delete-ace-dialog.component.spec.ts (100%) rename src/app/components/{ace-management => acl-management}/delete-ace-dialog/delete-ace-dialog.component.ts (100%) diff --git a/src/app/app-routing.module.ts b/src/app/app-routing.module.ts index 2fe06586..257d012b 100644 --- a/src/app/app-routing.module.ts +++ b/src/app/app-routing.module.ts @@ -69,12 +69,12 @@ import { GroupResolver } from "./resolvers/group.resolver"; import { GroupRoleResolver } from "./resolvers/group-role.resolver"; import { RoleDetailComponent } from "./components/role-management/role-detail/role-detail.component"; import { RoleDetailResolver } from "./resolvers/role-detail.resolver"; -import {AceManagementComponent} from "@components/ace-management/ace-management.component"; -import {ResourcePoolsManagementComponent} from "@components/resource-pools-management/resource-pools-management.component"; -import {ResourcePoolDetailsComponent} from "@components/resource-pool-details/resource-pool-details.component"; -import {ResourcePoolsResolver} from "@resolvers/resource-pools.resolver"; -import {GroupAcesResolver} from "@resolvers/group-ace.resolver.ts.resolver"; -import {UserAcesResolver} from "@resolvers/user-aces.resolver"; +import { AclManagementComponent } from "@components/acl-management/acl-management.component"; +import { ResourcePoolsManagementComponent } from "@components/resource-pools-management/resource-pools-management.component"; +import { ResourcePoolDetailsComponent } from "@components/resource-pool-details/resource-pool-details.component"; +import { ResourcePoolsResolver } from "@resolvers/resource-pools.resolver"; +import { GroupAcesResolver } from "@resolvers/group-ace.resolver.ts.resolver"; +import { UserAcesResolver } from "@resolvers/user-aces.resolver"; const routes: Routes = [ { @@ -249,12 +249,12 @@ const routes: Routes = [ component: RoleManagementComponent }, { - path: "resourcePools", + path: "pools", component: ResourcePoolsManagementComponent }, { - path: 'aces', - component: AceManagementComponent + path: 'ACL', + component: AclManagementComponent } ] }, diff --git a/src/app/app.module.ts b/src/app/app.module.ts index f2ce3a99..12136074 100644 --- a/src/app/app.module.ts +++ b/src/app/app.module.ts @@ -309,13 +309,13 @@ import { ExportPortableProjectComponent } from './components/export-portable-pro import { NodesMenuConfirmationDialogComponent } from './components/project-map/nodes-menu/nodes-menu-confirmation-dialog/nodes-menu-confirmation-dialog.component'; import { ConfirmationDeleteAllProjectsComponent } from './components/projects/confirmation-delete-all-projects/confirmation-delete-all-projects.component'; import { ProjectMapLockConfirmationDialogComponent } from './components/project-map/project-map-menu/project-map-lock-confirmation-dialog/project-map-lock-confirmation-dialog.component'; -import {AceManagementComponent} from "@components/ace-management/ace-management.component"; -import { AddAceDialogComponent } from './components/ace-management/add-ace-dialog/add-ace-dialog.component'; -import { AutocompleteComponent } from './components/ace-management/add-ace-dialog/autocomplete/autocomplete.component'; -import { DeleteAceDialogComponent } from './components/ace-management/delete-ace-dialog/delete-ace-dialog.component'; +import { AclManagementComponent } from "@components/acl-management/acl-management.component"; +import { AddAceDialogComponent } from './components/acl-management/add-ace-dialog/add-ace-dialog.component'; +import { AutocompleteComponent } from './components/acl-management/add-ace-dialog/autocomplete/autocomplete.component'; +import { DeleteAceDialogComponent } from './components/acl-management/delete-ace-dialog/delete-ace-dialog.component'; import { AceFilterPipe } from './filters/ace-filter.pipe'; -import {CdkAccordionModule} from "@angular/cdk/accordion"; -import {CdkTreeModule} from "@angular/cdk/tree"; +import { CdkAccordionModule } from "@angular/cdk/accordion"; +import { CdkTreeModule } from "@angular/cdk/tree"; import { PrivilegeComponent } from './components/role-management/role-detail/privilege/privilege.component'; import { GroupPrivilegesPipe } from './components/role-management/role-detail/privilege/group-privileges.pipe'; @@ -547,7 +547,7 @@ import { DeleteResourceConfirmationDialogComponent } from './components/resource NodesMenuConfirmationDialogComponent, ConfirmationDeleteAllProjectsComponent, ProjectMapLockConfirmationDialogComponent, - AceManagementComponent, + AclManagementComponent, AddAceDialogComponent, AutocompleteComponent, DeleteAceDialogComponent, diff --git a/src/app/components/ace-management/ace-management.component.html b/src/app/components/acl-management/acl-management.component.html similarity index 100% rename from src/app/components/ace-management/ace-management.component.html rename to src/app/components/acl-management/acl-management.component.html diff --git a/src/app/components/ace-management/ace-management.component.scss b/src/app/components/acl-management/acl-management.component.scss similarity index 100% rename from src/app/components/ace-management/ace-management.component.scss rename to src/app/components/acl-management/acl-management.component.scss diff --git a/src/app/components/ace-management/ace-management.component.spec.ts b/src/app/components/acl-management/acl-management.component.spec.ts similarity index 51% rename from src/app/components/ace-management/ace-management.component.spec.ts rename to src/app/components/acl-management/acl-management.component.spec.ts index c491e561..2951938d 100644 --- a/src/app/components/ace-management/ace-management.component.spec.ts +++ b/src/app/components/acl-management/acl-management.component.spec.ts @@ -1,18 +1,18 @@ import { ComponentFixture, TestBed } from '@angular/core/testing'; -import { AceManagementComponent } from './ace-management.component'; +import { AclManagementComponent } from './acl-management.component'; -describe('AceManagementComponent', () => { - let component: AceManagementComponent; - let fixture: ComponentFixture; +describe('AclManagementComponent', () => { + let component: AclManagementComponent; + let fixture: ComponentFixture; beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ AceManagementComponent ] + declarations: [ AclManagementComponent ] }) .compileComponents(); - fixture = TestBed.createComponent(AceManagementComponent); + fixture = TestBed.createComponent(AclManagementComponent); component = fixture.componentInstance; fixture.detectChanges(); }); diff --git a/src/app/components/ace-management/ace-management.component.ts b/src/app/components/acl-management/acl-management.component.ts similarity index 94% rename from src/app/components/ace-management/ace-management.component.ts rename to src/app/components/acl-management/acl-management.component.ts index 42408690..56404f10 100644 --- a/src/app/components/ace-management/ace-management.component.ts +++ b/src/app/components/acl-management/acl-management.component.ts @@ -26,18 +26,18 @@ import {AclService} from "@services/acl.service"; import {MatPaginator} from "@angular/material/paginator"; import {MatSort} from "@angular/material/sort"; import {AddUserDialogComponent} from "@components/user-management/add-user-dialog/add-user-dialog.component"; -import {AddAceDialogComponent} from "@components/ace-management/add-ace-dialog/add-ace-dialog.component"; +import {AddAceDialogComponent} from "@components/acl-management/add-ace-dialog/add-ace-dialog.component"; import {DeleteUserDialogComponent} from "@components/user-management/delete-user-dialog/delete-user-dialog.component"; -import {DeleteAceDialogComponent} from "@components/ace-management/delete-ace-dialog/delete-ace-dialog.component"; +import {DeleteAceDialogComponent} from "@components/acl-management/delete-ace-dialog/delete-ace-dialog.component"; import {User} from "@models/users/user"; import {Endpoint} from "@models/api/endpoint"; @Component({ - selector: 'app-ace-management', - templateUrl: './ace-management.component.html', - styleUrls: ['./ace-management.component.scss'] + selector: 'app-acl-management', + templateUrl: './acl-management.component.html', + styleUrls: ['./acl-management.component.scss'] }) -export class AceManagementComponent implements OnInit { +export class AclManagementComponent implements OnInit { @ViewChildren('acesPaginator') acesPaginator: QueryList; diff --git a/src/app/components/ace-management/add-ace-dialog/EndpointTreeAdapter.spec.ts b/src/app/components/acl-management/add-ace-dialog/EndpointTreeAdapter.spec.ts similarity index 96% rename from src/app/components/ace-management/add-ace-dialog/EndpointTreeAdapter.spec.ts rename to src/app/components/acl-management/add-ace-dialog/EndpointTreeAdapter.spec.ts index 8597edc3..e898badc 100644 --- a/src/app/components/ace-management/add-ace-dialog/EndpointTreeAdapter.spec.ts +++ b/src/app/components/acl-management/add-ace-dialog/EndpointTreeAdapter.spec.ts @@ -1,4 +1,4 @@ -import {EndpointTreeAdapter} from "@components/ace-management/add-ace-dialog/EndpointTreeAdapter"; +import {EndpointTreeAdapter} from "@components/acl-management/add-ace-dialog/EndpointTreeAdapter"; import {Endpoint, RessourceType} from "@models/api/endpoint"; const endpoint1: Endpoint = { diff --git a/src/app/components/ace-management/add-ace-dialog/EndpointTreeAdapter.ts b/src/app/components/acl-management/add-ace-dialog/EndpointTreeAdapter.ts similarity index 100% rename from src/app/components/ace-management/add-ace-dialog/EndpointTreeAdapter.ts rename to src/app/components/acl-management/add-ace-dialog/EndpointTreeAdapter.ts diff --git a/src/app/components/ace-management/add-ace-dialog/add-ace-dialog.component.html b/src/app/components/acl-management/add-ace-dialog/add-ace-dialog.component.html similarity index 100% rename from src/app/components/ace-management/add-ace-dialog/add-ace-dialog.component.html rename to src/app/components/acl-management/add-ace-dialog/add-ace-dialog.component.html diff --git a/src/app/components/ace-management/add-ace-dialog/add-ace-dialog.component.scss b/src/app/components/acl-management/add-ace-dialog/add-ace-dialog.component.scss similarity index 100% rename from src/app/components/ace-management/add-ace-dialog/add-ace-dialog.component.scss rename to src/app/components/acl-management/add-ace-dialog/add-ace-dialog.component.scss diff --git a/src/app/components/ace-management/add-ace-dialog/add-ace-dialog.component.spec.ts b/src/app/components/acl-management/add-ace-dialog/add-ace-dialog.component.spec.ts similarity index 100% rename from src/app/components/ace-management/add-ace-dialog/add-ace-dialog.component.spec.ts rename to src/app/components/acl-management/add-ace-dialog/add-ace-dialog.component.spec.ts diff --git a/src/app/components/ace-management/add-ace-dialog/add-ace-dialog.component.ts b/src/app/components/acl-management/add-ace-dialog/add-ace-dialog.component.ts similarity index 98% rename from src/app/components/ace-management/add-ace-dialog/add-ace-dialog.component.ts rename to src/app/components/acl-management/add-ace-dialog/add-ace-dialog.component.ts index 2bd4959c..30fc43b5 100644 --- a/src/app/components/ace-management/add-ace-dialog/add-ace-dialog.component.ts +++ b/src/app/components/acl-management/add-ace-dialog/add-ace-dialog.component.ts @@ -27,7 +27,7 @@ import {Role} from "@models/api/role"; import {RoleService} from "@services/role.service"; import {NestedTreeControl} from "@angular/cdk/tree"; import {ArrayDataSource} from "@angular/cdk/collections"; -import {EndpointNode, EndpointTreeAdapter} from "@components/ace-management/add-ace-dialog/EndpointTreeAdapter"; +import {EndpointNode, EndpointTreeAdapter} from "@components/acl-management/add-ace-dialog/EndpointTreeAdapter"; diff --git a/src/app/components/ace-management/add-ace-dialog/autocomplete/autocomplete.component.html b/src/app/components/acl-management/add-ace-dialog/autocomplete/autocomplete.component.html similarity index 100% rename from src/app/components/ace-management/add-ace-dialog/autocomplete/autocomplete.component.html rename to src/app/components/acl-management/add-ace-dialog/autocomplete/autocomplete.component.html diff --git a/src/app/components/ace-management/add-ace-dialog/autocomplete/autocomplete.component.scss b/src/app/components/acl-management/add-ace-dialog/autocomplete/autocomplete.component.scss similarity index 100% rename from src/app/components/ace-management/add-ace-dialog/autocomplete/autocomplete.component.scss rename to src/app/components/acl-management/add-ace-dialog/autocomplete/autocomplete.component.scss diff --git a/src/app/components/ace-management/add-ace-dialog/autocomplete/autocomplete.component.spec.ts b/src/app/components/acl-management/add-ace-dialog/autocomplete/autocomplete.component.spec.ts similarity index 100% rename from src/app/components/ace-management/add-ace-dialog/autocomplete/autocomplete.component.spec.ts rename to src/app/components/acl-management/add-ace-dialog/autocomplete/autocomplete.component.spec.ts diff --git a/src/app/components/ace-management/add-ace-dialog/autocomplete/autocomplete.component.ts b/src/app/components/acl-management/add-ace-dialog/autocomplete/autocomplete.component.ts similarity index 100% rename from src/app/components/ace-management/add-ace-dialog/autocomplete/autocomplete.component.ts rename to src/app/components/acl-management/add-ace-dialog/autocomplete/autocomplete.component.ts diff --git a/src/app/components/ace-management/delete-ace-dialog/delete-ace-dialog.component.html b/src/app/components/acl-management/delete-ace-dialog/delete-ace-dialog.component.html similarity index 100% rename from src/app/components/ace-management/delete-ace-dialog/delete-ace-dialog.component.html rename to src/app/components/acl-management/delete-ace-dialog/delete-ace-dialog.component.html diff --git a/src/app/components/ace-management/delete-ace-dialog/delete-ace-dialog.component.scss b/src/app/components/acl-management/delete-ace-dialog/delete-ace-dialog.component.scss similarity index 100% rename from src/app/components/ace-management/delete-ace-dialog/delete-ace-dialog.component.scss rename to src/app/components/acl-management/delete-ace-dialog/delete-ace-dialog.component.scss diff --git a/src/app/components/ace-management/delete-ace-dialog/delete-ace-dialog.component.spec.ts b/src/app/components/acl-management/delete-ace-dialog/delete-ace-dialog.component.spec.ts similarity index 100% rename from src/app/components/ace-management/delete-ace-dialog/delete-ace-dialog.component.spec.ts rename to src/app/components/acl-management/delete-ace-dialog/delete-ace-dialog.component.spec.ts diff --git a/src/app/components/ace-management/delete-ace-dialog/delete-ace-dialog.component.ts b/src/app/components/acl-management/delete-ace-dialog/delete-ace-dialog.component.ts similarity index 100% rename from src/app/components/ace-management/delete-ace-dialog/delete-ace-dialog.component.ts rename to src/app/components/acl-management/delete-ace-dialog/delete-ace-dialog.component.ts diff --git a/src/app/components/group-details/group-details.component.html b/src/app/components/group-details/group-details.component.html index eb2d5872..876c8932 100644 --- a/src/app/components/group-details/group-details.component.html +++ b/src/app/components/group-details/group-details.component.html @@ -56,7 +56,7 @@ [pageSizeOptions]="[5, 20, 50, 100]"> - +
diff --git a/src/app/components/management/management.component.ts b/src/app/components/management/management.component.ts index 91e90e0f..101a6102 100644 --- a/src/app/components/management/management.component.ts +++ b/src/app/components/management/management.component.ts @@ -23,7 +23,7 @@ import {ControllerService} from "@services/controller.service"; export class ManagementComponent implements OnInit { controller: Controller; - links = ['users', 'groups', 'roles', 'resourcePools', 'aces']; + links = ['users', 'groups', 'roles', 'pools', 'ACL']; activeLink: string = this.links[0]; constructor( diff --git a/src/app/components/user-management/user-detail/user-detail.component.html b/src/app/components/user-management/user-detail/user-detail.component.html index 51ccde52..f7a0238c 100644 --- a/src/app/components/user-management/user-detail/user-detail.component.html +++ b/src/app/components/user-management/user-detail/user-detail.component.html @@ -81,7 +81,7 @@ - +