Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ba meyer master #68

Merged
merged 83 commits into from
Aug 2, 2022
Merged
Changes from all commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
725a2d5
CHANGED & ADDED
Jun 11, 2020
b31eb63
CHANGED & ADDED
Jun 11, 2020
94713d0
CHANGED files
Jun 14, 2020
c1f1299
Added confirm dialog
Jun 15, 2020
efc9882
Fixed author picker
Jun 21, 2020
670b6c7
Merged master
Jul 1, 2020
559b789
Fixed merge changes
Jul 1, 2020
b12e9be
Deleted unused code
Jul 1, 2020
24cbaad
FIXED lint errors
Jul 6, 2020
70f2f82
FIXED karma erros
Jul 6, 2020
ba9d9c9
DELETED unused code and files
Jul 6, 2020
4c29ad8
ADDED Context enum, CHANGED files
Jul 6, 2020
ad60ff5
Fixed lint error
Jul 6, 2020
cc377a6
DELETED merge mistake
Jul 7, 2020
e1f51c7
ADDED features
Oct 3, 2020
7f08f38
MERGED master
Oct 5, 2020
2d1bb00
ADDED minor changes
Oct 7, 2020
f470aa6
CHANGE code clean up
Oct 8, 2020
7b509e2
CHANGE deep code suggestion
Oct 8, 2020
3448491
CHANGED urls
Oct 19, 2020
8501613
RESET routing
Oct 19, 2020
aed8084
Merge branch 'master' into ba-merge
Oct 19, 2020
f9c1993
MERGE master into ba-meyer-master
TYueksel Aug 27, 2021
cb64e59
Fixed bugs from MERGE master
TYueksel Sep 9, 2021
2d9d1ca
Removed dead code and fixed lint error
TYueksel Sep 10, 2021
21d17e1
Fixed lint errors
TYueksel Sep 11, 2021
78b7b4a
Delete comment-list.component.spec.ts
TYueksel Sep 13, 2021
4c28452
cleaned up the log messages
TYueksel Sep 20, 2021
612a001
Merge branch 'ba-meyer-master' of https://github.com/PatternAtlas/pat…
TYueksel Sep 20, 2021
8e39336
Added candidates to languages tab
TYueksel Oct 19, 2021
371766f
Fix linting issues
TYueksel Oct 19, 2021
3b34747
Merge branch 'master' into ba-meyer-master
TYueksel Oct 21, 2021
df7e8e5
fixed katex import
TYueksel Oct 25, 2021
c6dfddd
Added types and fixed typo
TYueksel Oct 30, 2021
387c4b6
Added Priv Management UI and Admin UI bug fix
TYueksel Mar 4, 2022
a258c82
added feature toggle for authentication
mhinkie Mar 15, 2022
e9f5a40
Merge branch 'master' into ba-meyer-master
mhinkie Mar 17, 2022
98b588d
Merge branch 'master' into ba-meyer-master
mhinkie Mar 17, 2022
a830892
fixed broken ui spacing
mhinkie Mar 17, 2022
c64b71c
fixed adding authors on create
mhinkie Apr 5, 2022
5eecd41
linter fixes
mhinkie Apr 5, 2022
438fd7a
added fix for role overview in admin panel
mhinkie Apr 6, 2022
e37319d
fixed adding/deleting users
mhinkie Apr 6, 2022
e16e6cc
user info page now shows correct role
mhinkie Apr 6, 2022
0866f5e
add management tab for default author privileges
PhilWun Apr 25, 2022
967dc47
add dialog to ask if the user wants to also update all resource speci…
PhilWun May 2, 2022
bf7e247
change http method to match the REST guidelines
PhilWun May 2, 2022
d9493e3
adjustment for keycloak integration + auth service bugfixes
mhinkie May 11, 2022
b5100f9
keycloak integration changes
mhinkie May 11, 2022
407c92a
added link to user-credentials management in keycloak
mhinkie May 12, 2022
5c24041
fixed logout bug
mhinkie May 12, 2022
7fb4b16
removed feature toggles for planqkUI and disabled design models
mhinkie Jun 5, 2022
75ce442
added missing privilege toggle for issues
mhinkie Jun 5, 2022
6edeab8
added missing privilege checks for add button
mhinkie Jun 5, 2022
fcbff93
added privilege checks for pattern deleting ui
mhinkie Jun 5, 2022
8edadb0
added privilege checks for pattern details
mhinkie Jun 5, 2022
c6f492a
added missing privilege check for issue-settings
mhinkie Jun 5, 2022
306e7b2
removed unneeded log messages
mhinkie Jun 5, 2022
0b782ed
adapted environment for docker image with authentication
mhinkie Jun 5, 2022
01caf06
removed some unused code
mhinkie Jun 5, 2022
d6768ee
removed unused else
mhinkie Jun 28, 2022
36ff17f
added union of literals instead of privilegetype
mhinkie Jul 19, 2022
a7fef73
removed manual change deteaction
mhinkie Jul 19, 2022
82fab43
changed differentiation between update and create in user-detail
mhinkie Jul 19, 2022
10191e4
removed vscode settings
mhinkie Jul 19, 2022
98749a8
split and renamed keys for local storage
mhinkie Jul 19, 2022
1fdd1ea
fixed random string fn
mhinkie Jul 19, 2022
c0e36e9
added descriptive names in privilege service
mhinkie Jul 19, 2022
85e9974
added aria-label for icon buttons that do not have a descr nearby or a
mhinkie Jul 19, 2022
7e56841
removed author list change det.
mhinkie Jul 19, 2022
ca31379
used full buffer for randoms tring generation
mhinkie Jul 19, 2022
40a4a40
component styling and action changes according to pr
mhinkie Jul 20, 2022
ba62baf
added liter rules for banned types (i.e. String)
mhinkie Jul 20, 2022
9ef983d
model changes and ui adaptions
mhinkie Jul 21, 2022
499a41a
removed spaces
mhinkie Jul 21, 2022
bfd8976
changed to container to remove linebreak
mhinkie Jul 21, 2022
a52843f
fixed linter errors found by new ban-types rule
mhinkie Jul 21, 2022
5770f5a
changed new services to use typed http requests
mhinkie Aug 1, 2022
a8dc49f
changed admin panel to allow changing roles for users without email
mhinkie Aug 1, 2022
b46a96a
small ui component refactoring
mhinkie Aug 1, 2022
c547acd
added routerlink for back button in issue-author management
mhinkie Aug 1, 2022
53b1c00
removed stoppropagation
mhinkie Aug 1, 2022
e6fa090
comment changes and documentation
mhinkie Aug 2, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .eslintrc.js
Original file line number Diff line number Diff line change
@@ -18,6 +18,8 @@ module.exports = {
// "extends": "tslint:recommended",

rules: {
"@typescript-eslint/ban-types": ['error'],

// https://eslint.org/docs/rules/indent
'indent': ['error', 2, {
"FunctionDeclaration": {"parameters": "first"},
18 changes: 0 additions & 18 deletions .vscode/launch.json

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

31 changes: 22 additions & 9 deletions src/app/admin-management/admin-management.module.ts
Original file line number Diff line number Diff line change
@@ -9,25 +9,31 @@ import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { MatFormFieldModule } from '@angular/material/form-field';
import { MatInputModule } from '@angular/material/input';
import { MatButtonToggleModule } from '@angular/material/button-toggle';
import { AdminManagementListComponent } from './admin-management-list/admin-management-list.component';
import { AdminManagementDetailComponent } from './admin-management-detail/admin-management-detail.component';
import { MatRadioModule } from '@angular/material/radio';
import { MatTabsModule } from '@angular/material/tabs';
/** Component */
import { UserListComponent } from './user/user-list/user-list.component';
import { UserDetailComponent } from './user/user-detail/user-detail.component';
import { PrivilegeComponent } from './privilege/privilege.component';
import { MatCheckboxModule } from '@angular/material/checkbox';

export const ADMIN_MANAGEMENT_ROUTES = [
{
path: '',
children: [
{ path: '', component: AdminManagementListComponent },
{ path: 'edit/:id', component: AdminManagementDetailComponent },
{ path: 'create', component: AdminManagementDetailComponent }
{ path: '', component: UserListComponent },
{ path: 'edit/:id', component: UserDetailComponent },
{ path: 'create', component: UserDetailComponent }
]
}
];

@NgModule({
declarations: [
AdminManagementListComponent,
AdminManagementDetailComponent,

UserListComponent,
UserDetailComponent,
PrivilegeComponent,

],
imports: [
CommonModule,
@@ -40,11 +46,18 @@ export const ADMIN_MANAGEMENT_ROUTES = [
MatFormFieldModule,
MatInputModule,
MatButtonToggleModule,
MatRadioModule,
MatTabsModule,
MatCheckboxModule,
// Form
FormsModule,
ReactiveFormsModule
],
providers: []
providers: [
],
entryComponents: [
UserDetailComponent
]
})
export class AdminManagementModule {
}
18 changes: 18 additions & 0 deletions src/app/admin-management/privilege/privilege.component.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<table mat-table [dataSource]="dataSource" class="mat-elevation-z8">

<ng-container matColumnDef="PRIVILEGE">
<th mat-header-cell *matHeaderCellDef> PRIVILEGE </th>
<td mat-cell *matCellDef="let element"> {{element.name}} </td>
</ng-container>

<ng-container [matColumnDef]="role.name" *ngFor="let role of roles;trackBy: trackByFn">
<th mat-header-cell *matHeaderCellDef> {{role.name}} </th>
<td mat-cell *matCellDef="let element; let i = index">
<mat-checkbox [checked]="role.privileges.includes(element.name)" (change)="change($event, element, role)">
</mat-checkbox>
</td>
</ng-container>

<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
</table>
3 changes: 3 additions & 0 deletions src/app/admin-management/privilege/privilege.component.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
table {
width: 100%;
}
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
import { async, ComponentFixture, TestBed } from '@angular/core/testing';

import { IssueCreateDialogComponent } from './issue-create-dialog.component';
import { PrivilegeComponent } from './privilege.component';

describe('IssueCreateDialogComponent', () => {
let component: IssueCreateDialogComponent;
let fixture: ComponentFixture<IssueCreateDialogComponent>;
describe('PrivilegeComponent', () => {
let component: PrivilegeComponent;
let fixture: ComponentFixture<PrivilegeComponent>;

beforeEach(async(() => {
TestBed.configureTestingModule({
declarations: [IssueCreateDialogComponent]
declarations: [ PrivilegeComponent ]
})
.compileComponents();
}));

beforeEach(() => {
fixture = TestBed.createComponent(IssueCreateDialogComponent);
fixture = TestBed.createComponent(PrivilegeComponent);
component = fixture.componentInstance;
fixture.detectChanges();
});
Loading