Skip to content

Commit 06ab45e

Browse files
lqwertLuca MeyerTYuekselmhinkiePhilWun
authored
Ba meyer master (#68)
* CHANGED & ADDED * CHANGED & ADDED * CHANGED files * Added confirm dialog * Fixed author picker * Fixed merge changes * Deleted unused code * FIXED lint errors * FIXED karma erros * DELETED unused code and files * ADDED Context enum, CHANGED files * Fixed lint error * DELETED merge mistake * ADDED features * ADDED minor changes * CHANGE code clean up * CHANGE deep code suggestion * CHANGED urls * RESET routing * Fixed bugs from MERGE master * Removed dead code and fixed lint error * Fixed lint errors * Delete comment-list.component.spec.ts * cleaned up the log messages * Added candidates to languages tab * Fix linting issues * fixed katex import * Added types and fixed typo * Added Priv Management UI and Admin UI bug fix * added feature toggle for authentication * fixed broken ui spacing * fixed adding authors on create * linter fixes * added fix for role overview in admin panel * fixed adding/deleting users * user info page now shows correct role * add management tab for default author privileges * add dialog to ask if the user wants to also update all resource specific roles and privileges * change http method to match the REST guidelines * adjustment for keycloak integration + auth service bugfixes * keycloak integration changes * added link to user-credentials management in keycloak * fixed logout bug * removed feature toggles for planqkUI and disabled design models * added missing privilege toggle for issues * added missing privilege checks for add button * added privilege checks for pattern deleting ui * added privilege checks for pattern details * added missing privilege check for issue-settings and disabled pattern-views to match planqk * removed unneeded log messages * adapted environment for docker image with authentication * removed some unused code * removed unused else * added union of literals instead of privilegetype * removed manual change deteaction * changed differentiation between update and create in user-detail * removed vscode settings * split and renamed keys for local storage * fixed random string fn * added descriptive names in privilege service * added aria-label for icon buttons that do not have a descr nearby or a tooltip * removed author list change det. * used full buffer for randoms tring generation * component styling and action changes according to pr * added liter rules for banned types (i.e. String) * model changes and ui adaptions * removed spaces * changed to container to remove linebreak * fixed linter errors found by new ban-types rule * changed new services to use typed http requests * changed admin panel to allow changing roles for users without email (this is managed in external system now) * small ui component refactoring * added routerlink for back button in issue-author management * removed stoppropagation * comment changes and documentation Co-authored-by: Luca Meyer <[email protected]> Co-authored-by: TYueksel <[email protected]> Co-authored-by: TYueksel <[email protected]> Co-authored-by: Alex <[email protected]> Co-authored-by: Philipp Wundrack <[email protected]>
1 parent 0ef1f62 commit 06ab45e

File tree

164 files changed

+4558
-1345
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

164 files changed

+4558
-1345
lines changed

.eslintrc.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ module.exports = {
1818
// "extends": "tslint:recommended",
1919

2020
rules: {
21+
"@typescript-eslint/ban-types": ['error'],
22+
2123
// https://eslint.org/docs/rules/indent
2224
'indent': ['error', 2, {
2325
"FunctionDeclaration": {"parameters": "first"},

.vscode/launch.json

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/app/admin-management/admin-management-detail/admin-management-detail.component.html

Lines changed: 0 additions & 42 deletions
This file was deleted.

src/app/admin-management/admin-management-detail/admin-management-detail.component.scss

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/app/admin-management/admin-management-detail/admin-management-detail.component.ts

Lines changed: 0 additions & 96 deletions
This file was deleted.

src/app/admin-management/admin-management-list/admin-management-list.component.html

Lines changed: 0 additions & 56 deletions
This file was deleted.

src/app/admin-management/admin-management-list/admin-management-list.component.ts

Lines changed: 0 additions & 52 deletions
This file was deleted.

src/app/admin-management/admin-management.module.ts

Lines changed: 22 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,25 +9,31 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
99
import { MatFormFieldModule } from '@angular/material/form-field';
1010
import { MatInputModule } from '@angular/material/input';
1111
import { MatButtonToggleModule } from '@angular/material/button-toggle';
12-
import { AdminManagementListComponent } from './admin-management-list/admin-management-list.component';
13-
import { AdminManagementDetailComponent } from './admin-management-detail/admin-management-detail.component';
12+
import { MatRadioModule } from '@angular/material/radio';
13+
import { MatTabsModule } from '@angular/material/tabs';
14+
/** Component */
15+
import { UserListComponent } from './user/user-list/user-list.component';
16+
import { UserDetailComponent } from './user/user-detail/user-detail.component';
17+
import { PrivilegeComponent } from './privilege/privilege.component';
18+
import { MatCheckboxModule } from '@angular/material/checkbox';
1419

1520
export const ADMIN_MANAGEMENT_ROUTES = [
1621
{
1722
path: '',
1823
children: [
19-
{ path: '', component: AdminManagementListComponent },
20-
{ path: 'edit/:id', component: AdminManagementDetailComponent },
21-
{ path: 'create', component: AdminManagementDetailComponent }
24+
{ path: '', component: UserListComponent },
25+
{ path: 'edit/:id', component: UserDetailComponent },
26+
{ path: 'create', component: UserDetailComponent }
2227
]
2328
}
2429
];
2530

2631
@NgModule({
2732
declarations: [
28-
AdminManagementListComponent,
29-
AdminManagementDetailComponent,
30-
33+
UserListComponent,
34+
UserDetailComponent,
35+
PrivilegeComponent,
36+
3137
],
3238
imports: [
3339
CommonModule,
@@ -40,11 +46,18 @@ export const ADMIN_MANAGEMENT_ROUTES = [
4046
MatFormFieldModule,
4147
MatInputModule,
4248
MatButtonToggleModule,
49+
MatRadioModule,
50+
MatTabsModule,
51+
MatCheckboxModule,
4352
// Form
4453
FormsModule,
4554
ReactiveFormsModule
4655
],
47-
providers: []
56+
providers: [
57+
],
58+
entryComponents: [
59+
UserDetailComponent
60+
]
4861
})
4962
export class AdminManagementModule {
5063
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<table mat-table [dataSource]="dataSource" class="mat-elevation-z8">
2+
3+
<ng-container matColumnDef="PRIVILEGE">
4+
<th mat-header-cell *matHeaderCellDef> PRIVILEGE </th>
5+
<td mat-cell *matCellDef="let element"> {{element.name}} </td>
6+
</ng-container>
7+
8+
<ng-container [matColumnDef]="role.name" *ngFor="let role of roles;trackBy: trackByFn">
9+
<th mat-header-cell *matHeaderCellDef> {{role.name}} </th>
10+
<td mat-cell *matCellDef="let element; let i = index">
11+
<mat-checkbox [checked]="role.privileges.includes(element.name)" (change)="change($event, element, role)">
12+
</mat-checkbox>
13+
</td>
14+
</ng-container>
15+
16+
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
17+
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
18+
</table>
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
table {
2+
width: 100%;
3+
}

0 commit comments

Comments
 (0)