Skip to content

Commit

Permalink
feat: allow user, group, perm deletion
Browse files Browse the repository at this point in the history
feat: user can be activated / desactivated
feat: shorten role display name
feat: edit permission with a textarea

Fix #67
Fix #68
Fix #69
Fix #70
Fix #71
Fix #72
Fix #73
Fix #76
  • Loading branch information
sebbousquet committed May 14, 2024
1 parent 955118b commit 8f61790
Show file tree
Hide file tree
Showing 30 changed files with 420 additions and 137 deletions.
127 changes: 63 additions & 64 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
"@typescript-eslint/eslint-plugin": "^5.36.2",
"@typescript-eslint/parser": "^5.36.2",
"ajv-keywords": "5.1.0",
"arlas-wui-toolkit": "25.0.0-beta.16",
"arlas-wui-toolkit": "25.0.0-rc.5",
"eslint": "^8.2.0",
"js-yaml": "4.1.0",
"patch-package": "^6.4.7",
Expand Down
12 changes: 5 additions & 7 deletions src/app/app-routing.module.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,15 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { PermissionCreateComponent } from '@components/permission/permission-create/permission-create.component';
import { AuthGuardIamService, ForgotComponent, LoginComponent, RegisterComponent, ResetComponent, VerifyComponent } from 'arlas-wui-toolkit';
import { HomeComponent } from './components/home/home.component';
import { PermissionComponent } from './components/permission/permission.component';
import { RoleFormComponent } from './components/role/role-form/role-form.component';
import { RoleComponent } from './components/role/role.component';
import { RulesComponent } from './components/rules/rules.component';
import { UserAddComponent } from './components/user/user-add/user-add.component';
import { UserFormComponent } from './components/user/user-form/user-form.component';
import { UserComponent } from './components/user/user.component';
import { UserAddComponent } from './components/user/user-add/user-add.component';
import { RulesComponent } from './components/rules/rules.component';
import {
PermissionCreateColumnFilterComponent
} from './components/permission/permission-create-column-filter/permission-create-column-filter.component';


const routes: Routes = [
Expand All @@ -38,8 +36,8 @@ const routes: Routes = [
path: 'permission', canActivate: [AuthGuardIamService],
children: [
{ path: '', component: PermissionComponent },
{ path: 'create', component: PermissionCreateColumnFilterComponent },
{ path: 'edit/:id', component: PermissionCreateColumnFilterComponent }
{ path: 'create', component: PermissionCreateComponent },
{ path: 'edit/:id', component: PermissionCreateComponent }
]
},
{
Expand Down
7 changes: 4 additions & 3 deletions src/app/app.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ import { MatToolbarModule } from '@angular/material/toolbar';
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
import { RouterModule } from '@angular/router';
import { TranslateLoader, TranslateModule } from '@ngx-translate/core';
import { TranslateHttpLoader } from '@ngx-translate/http-loader';
import {
ArlasCollaborativesearchService, ArlasConfigurationDescriptor, ArlasIamService,
ArlasSettingsService,
Expand All @@ -43,6 +42,7 @@ import {
import { PermissionCreateComponent } from './components/permission/permission-create/permission-create.component';

import { MatTooltipModule } from '@angular/material/tooltip';
import { ArlasTranslateLoader } from '@tools/customLoader';
import { OAuthModule } from 'angular-oauth2-oidc';
import { PermissionComponent } from './components/permission/permission.component';
import { RoleFormComponent } from './components/role/role-form/role-form.component';
Expand All @@ -53,8 +53,8 @@ import { TopMenuComponent } from './components/top-menu/top-menu.component';
import { UserAddComponent } from './components/user/user-add/user-add.component';
import { UserFormComponent } from './components/user/user-form/user-form.component';
import { UserComponent } from './components/user/user.component';
import { RoleNamePipe } from './pipe/role-name.pipe';
import { IamStartupService } from './services/startup/startup.service';
import { ArlasTranslateLoader } from '@tools/customLoader';

export function startupServiceFactory(startup: IamStartupService) {
const load = () => startup.load();
Expand All @@ -81,7 +81,8 @@ export function auhtentServiceFactory(service: AuthentificationService) {
RulesComponent,
RulesItemComponent,
PermissionCreateColumnFilterComponent,
CreateOrgModalComponent
CreateOrgModalComponent,
RoleNamePipe
],
imports: [
BrowserModule,
Expand Down
3 changes: 2 additions & 1 deletion src/app/components/home/home.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
</span>
<span class="label">{{'Home' | translate}}</span>
</mat-list-item>
<mat-divider></mat-divider>
<mat-list-item [matTooltip]="'User' | translate" [disabled]="currentSelectedOrg === null" [routerLink]="'user'" routerLinkActive="active-page" [matTooltipPosition]="'right'"
[queryParamsHandling]="'preserve'">
<span class="material-symbols-outlined">
Expand Down Expand Up @@ -105,4 +106,4 @@ <h3>{{'My organisations' | translate}}</h3>
<router-outlet></router-outlet>
</div>
</div>
<mat-toolbar class="footer">© Gisaïa 2023</mat-toolbar>
<mat-toolbar class="footer">© Gisaïa 2024</mat-toolbar>
1 change: 1 addition & 0 deletions src/app/components/home/home.component.scss
Original file line number Diff line number Diff line change
Expand Up @@ -51,6 +51,7 @@
justify-content: space-between;
}
.route-nav-list {
padding-top: 0;
.active-page {
color: #ff5722;
}
Expand Down
Loading

0 comments on commit 8f61790

Please sign in to comment.