Merge pull request #1460 from Orange-OpenSource/master-3.0

Master 3.0, add privileges to role management

src/app/app-routing.module.ts

@@ -60,20 +60,15 @@ import { ImageManagerComponent } from './components/image-manager/image-manager.
 import { UserDetailComponent } from "./components/user-management/user-detail/user-detail.component";
 import { UserDetailResolver } from "./resolvers/user-detail.resolver";
 import { ManagementComponent } from "./components/management/management.component";
-import { PermissionResolver } from "./resolvers/permission.resolver";
 import { UserGroupsResolver } from "./resolvers/user-groups.resolver";
-import { UserPermissionsResolver } from "./resolvers/user-permissions.resolver";
 import { GroupManagementComponent } from "./components/group-management/group-management.component";
 import { RoleManagementComponent } from "./components/role-management/role-management.component";
-import { PermissionsManagementComponent } from "./components/permissions-management/permissions-management.component";
 import { GroupDetailsComponent } from "./components/group-details/group-details.component";
 import { GroupMembersResolver } from "./resolvers/group-members.resolver";
 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 { RolePermissionsComponent } from "./components/role-management/role-detail/role-permissions/role-permissions.component";
-import { UserPermissionsComponent } from "./components/user-management/user-detail/user-permissions/user-permissions.component";
 
 const routes: Routes = [
   {
@@ -102,7 +97,6 @@ const routes: Routes = [
         resolve: {
           user: UserDetailResolver,
           groups: UserGroupsResolver,
-          permissions: UserPermissionsResolver,
           controller: ControllerResolve},
       },
       { path: 'installed-software', component: InstalledSoftwareComponent },
@@ -237,10 +231,6 @@ const routes: Routes = [
           {
             path: 'roles',
             component: RoleManagementComponent
-          },
-          {
-            path: 'permissions',
-            component: PermissionsManagementComponent
           }
         ]
       },
@@ -262,25 +252,6 @@ const routes: Routes = [
           controller: ControllerResolve
         }
       },
-      {
-        path: 'controller/:controller_id/management/roles/:role_id/permissions',
-        component: RolePermissionsComponent,
-        resolve: {
-          role: RoleDetailResolver,
-          controller: ControllerResolve,
-          permissions: PermissionResolver
-        }
-      },
-      {
-        path: 'controller/:controller_id/management/users/:user_id/permissions',
-        component: UserPermissionsComponent,
-        resolve: {
-          user: UserDetailResolver,
-          userPermissions: UserPermissionsResolver,
-          controller: ControllerResolve,
-          permissions: PermissionResolver
-        }
-      }
     ],
   },
   {

src/app/app.module.ts

@@ -295,25 +295,10 @@ import { RoleFilterPipe } from './components/role-management/role-filter.pipe';
 import { AddRoleDialogComponent } from './components/role-management/add-role-dialog/add-role-dialog.component';
 import { DeleteRoleDialogComponent } from './components/role-management/delete-role-dialog/delete-role-dialog.component';
 import { RoleDetailComponent } from './components/role-management/role-detail/role-detail.component';
-import { PermissionEditorComponent } from './components/role-management/role-detail/permission-editor/permission-editor.component';
-import { EditablePermissionComponent } from './components/role-management/role-detail/permission-editor/editable-permission/editable-permission.component';
-import { PermissionEditorValidateDialogComponent } from './components/role-management/role-detail/permission-editor/permission-editor-validate-dialog/permission-editor-validate-dialog.component';
-import { PermissionsManagementComponent } from './components/permissions-management/permissions-management.component';
-import { PermissionEditLineComponent } from '@components/permissions-management/permission-edit-line/permission-edit-line.component';
 import {MatSlideToggleModule} from '@angular/material/slide-toggle';
-import { UserPermissionsComponent } from './components/user-management/user-detail/user-permissions/user-permissions.component';
-import {MatAutocompleteModule} from "@angular/material/autocomplete";
-import {PathAutoCompleteComponent} from './components/permissions-management/add-permission-line/path-auto-complete/path-auto-complete.component';
-import {FilterCompletePipe} from './components/permissions-management/add-permission-line/path-auto-complete/filter-complete.pipe';
-import { AddPermissionLineComponent } from './components/permissions-management/add-permission-line/add-permission-line.component';
-import { MethodButtonComponent } from './components/permissions-management/method-button/method-button.component';
-import { ActionButtonComponent } from './components/permissions-management/action-button/action-button.component';
-import { DeletePermissionDialogComponent } from './components/permissions-management/delete-permission-dialog/delete-permission-dialog.component';
+import {MatAutocompleteModule} from "@angular/material/autocomplete";;
 import { AddRoleToGroupComponent } from './components/group-details/add-role-to-group/add-role-to-group.component';
 import {MatFormFieldModule} from "@angular/material/form-field";
-import { PermissionsFilterPipe } from './components/permissions-management/permissions-filter.pipe';
-import { DisplayPathPipe } from './components/permissions-management/display-path.pipe';
-import {RolePermissionsComponent} from "@components/role-management/role-detail/role-permissions/role-permissions.component";
 import { ChangeUserPasswordComponent } from './components/user-management/user-detail/change-user-password/change-user-password.component';
 import {MatMenuModule} from "@angular/material/menu";
 import { ImageManagerComponent } from './components/image-manager/image-manager.component';
@@ -324,6 +309,8 @@ 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 { PrivilegeComponent } from './components/role-management/role-detail/privilege/privilege.component';
+import { GroupPrivilegesPipe } from './components/role-management/role-detail/privilege/group-privileges.pipe';
 
 @NgModule({
     declarations: [
@@ -533,26 +520,9 @@ import { ProjectMapLockConfirmationDialogComponent } from './components/project-
         AddRoleDialogComponent,
         DeleteRoleDialogComponent,
         RoleDetailComponent,
-        PermissionEditorComponent,
-        EditablePermissionComponent,
-        PermissionEditorValidateDialogComponent,
         RemoveToGroupDialogComponent,
-        PermissionsManagementComponent,
         AddRoleToGroupComponent,
-        PermissionEditLineComponent,
-        AddPermissionLineComponent,
-        MethodButtonComponent,
-        ActionButtonComponent,
-        DeletePermissionDialogComponent,
-        PathAutoCompleteComponent,
-        FilterCompletePipe,
-        UserPermissionsComponent,
-        PermissionsFilterPipe,
-        RolePermissionsComponent,
-        DisplayPathPipe,
         ChangeUserPasswordComponent,
-        FilterCompletePipe,
-        DisplayPathPipe,
         ChangeUserPasswordComponent,
         ProjectReadmeComponent,
         ImageManagerComponent,
@@ -563,6 +533,8 @@ import { ProjectMapLockConfirmationDialogComponent } from './components/project-
         NodesMenuConfirmationDialogComponent,
         ConfirmationDeleteAllProjectsComponent,
         ProjectMapLockConfirmationDialogComponent,
+        PrivilegeComponent,
+        GroupPrivilegesPipe,
     ],
     imports: [
         BrowserModule,

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', 'permissions'];
+  links = ['users', 'groups', 'roles'];
   activeLink: string = this.links[0];
 
   constructor(