diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index c1ff472c8..524af127d 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -17,7 +17,7 @@ repos: - id: check-vcs-permalinks - id: check-xml - id: check-yaml - exclude: "helm/" + exclude: "helm/|mkdocs.yml" - id: debug-statements - id: destroyed-symlinks - id: end-of-file-fixer diff --git a/backend/t4cclient/sessions/schema.py b/backend/t4cclient/sessions/schema.py index 8152db1aa..acf3a3b30 100644 --- a/backend/t4cclient/sessions/schema.py +++ b/backend/t4cclient/sessions/schema.py @@ -12,9 +12,10 @@ # 3rd party: from pydantic import BaseModel +from t4cclient.schemas.repositories import RepositoryUserPermission + # local: from t4cclient.sessions.operators.k8s import FileType -from t4cclient.schemas.repositories import RepositoryUserPermission class WorkspaceType(enum.Enum): diff --git a/docs/user/.dockerignore b/docs/user/.dockerignore index d97e10063..1320f90e5 100644 --- a/docs/user/.dockerignore +++ b/docs/user/.dockerignore @@ -1 +1 @@ -site \ No newline at end of file +site diff --git a/docs/user/.gitignore b/docs/user/.gitignore index d97e10063..1320f90e5 100644 --- a/docs/user/.gitignore +++ b/docs/user/.gitignore @@ -1 +1 @@ -site \ No newline at end of file +site diff --git a/docs/user/docs/about.md b/docs/user/docs/about.md index 6efff13b5..dbd07d953 100644 --- a/docs/user/docs/about.md +++ b/docs/user/docs/about.md @@ -1,5 +1,5 @@ -This service is provided by DB Netz AG. +This service is provided by DB Netz AG. Copyright 2022 DB Netz AG. We'd love to see your bug reports and improvement suggestions! Please give us your feedback.
-If you want to share some code - please have a look at [CONTRIBUTING.md](https://github.com/DSD-DBS/capella-collab-manager/blob/master/CONTRIBUTING.md) \ No newline at end of file +If you want to share some code - please have a look at [CONTRIBUTING.md](https://github.com/DSD-DBS/capella-collab-manager/blob/master/CONTRIBUTING.md) diff --git a/docs/user/docs/additional/alerts/create.md b/docs/user/docs/additional/alerts/create.md index a16c57451..3ff3ab48e 100644 --- a/docs/user/docs/additional/alerts/create.md +++ b/docs/user/docs/additional/alerts/create.md @@ -28,4 +28,4 @@ Alerts can be used to inform users about changes, news or maintenance work. The Link description ``` 3. The alert is now created and is displayed to all users: - ![Success alert](success_alert.png) \ No newline at end of file + ![Success alert](success_alert.png) diff --git a/docs/user/docs/index.md b/docs/user/docs/index.md index ab32022ab..5e6295e24 100644 --- a/docs/user/docs/index.md +++ b/docs/user/docs/index.md @@ -1,3 +1,3 @@ # Introduction -If you don't find the right answer to your question, please open an [issue on Github](https://github.com/DSD-DBS/capella-collab-manager/issues) or consider extending the documentation with a [pull request](https://github.com/DSD-DBS/capella-collab-manager/pulls). \ No newline at end of file +If you don't find the right answer to your question, please open an [issue on Github](https://github.com/DSD-DBS/capella-collab-manager/issues) or consider extending the documentation with a [pull request](https://github.com/DSD-DBS/capella-collab-manager/pulls). diff --git a/docs/user/docs/projects/delete.md b/docs/user/docs/projects/delete.md index acc641db9..de1506b4b 100644 --- a/docs/user/docs/projects/delete.md +++ b/docs/user/docs/projects/delete.md @@ -1 +1 @@ -Please ask your [administrator](roles.md) to delete a project. \ No newline at end of file +Please ask your [administrator](roles.md) to delete a project. diff --git a/docs/user/docs/projects/new.md b/docs/user/docs/projects/new.md index eacdba591..cc01842fb 100644 --- a/docs/user/docs/projects/new.md +++ b/docs/user/docs/projects/new.md @@ -1 +1 @@ -Please ask your [administrator](roles.md) to create a new project. \ No newline at end of file +Please ask your [administrator](roles.md) to create a new project. diff --git a/docs/user/docs/sessions/flows/git.md b/docs/user/docs/sessions/flows/git.md index e655b4ff8..1c412e836 100644 --- a/docs/user/docs/sessions/flows/git.md +++ b/docs/user/docs/sessions/flows/git.md @@ -1 +1 @@ -The documentation for the Git Workflow will follow in the future. \ No newline at end of file +The documentation for the Git Workflow will follow in the future. diff --git a/docs/user/docs/sessions/screenshot/screenshots.md b/docs/user/docs/sessions/screenshot/screenshots.md index b535dfb0d..eb5ee60a4 100644 --- a/docs/user/docs/sessions/screenshot/screenshots.md +++ b/docs/user/docs/sessions/screenshot/screenshots.md @@ -26,4 +26,4 @@ Alternatively, you can forbid the use of the clipboard: ![Forbid use of clipboard](clipboard.png) -Don't forget to turn it back on after taking the screenshot. \ No newline at end of file +Don't forget to turn it back on after taking the screenshot. diff --git a/docs/user/docs/sessions/types.md b/docs/user/docs/sessions/types.md index 8dd66ba39..5ffd31033 100644 --- a/docs/user/docs/sessions/types.md +++ b/docs/user/docs/sessions/types.md @@ -1,26 +1,26 @@ -You can choose two different types of workspaces: +You can choose two different types of workspaces: ### Persistent Sessions Persistent Sessions allows you to use personal workspace within Capella. -Your personal workspace will be stored and is part of our backup routines. -However, we still advise not to save any important information there. -By default, we will request 20GB of storage for your personal workspace. +Your personal workspace will be stored and is part of our backup routines. +However, we still advise not to save any important information there. +By default, we will request 20GB of storage for your personal workspace. -If your project uses the T4C-workflow, we will suggest all visible models in the T4C connection dialog. +If your project uses the T4C-workflow, we will suggest all visible models in the T4C connection dialog. ???+ tip - Starting the first time, your personal workspace will be empty. - Please close the `Welcome`-dialog first: + Starting the first time, your personal workspace will be empty. + Please close the `Welcome`-dialog first: ![Close Welcome dialog](close_welcome_dialog.png) - + Please follow the [Load a model into the workspace] instructions to load models into your workspace. !!! info Only work stored in the `/workspace` folder (default workspace folder) will be persistent. ### Readonly Sessions -Readonly Sessions allow you to read information from models without consuming a licence. +Readonly Sessions allow you to read information from models without consuming a licence. !!! warning Readonly sessions work only with linked git models. Please ask your project manager if your model has readonly support. @@ -28,4 +28,4 @@ Readonly Sessions allow you to read information from models without consuming a !!! danger Any changes made in read-only sessions will NOT be saved and cannot be restored. -*[T4C]: TeamForCapella \ No newline at end of file +*[T4C]: TeamForCapella diff --git a/docs/user/docs/users.md b/docs/user/docs/users.md index fb6c9c5fc..f67a8b453 100644 --- a/docs/user/docs/users.md +++ b/docs/user/docs/users.md @@ -2,4 +2,3 @@ You need to be project manager or administrator to use this feature. The documentation for the User Management will follow in the future. - diff --git a/frontend/src/app/active-sessions/active-sessions.component.ts b/frontend/src/app/active-sessions/active-sessions.component.ts index 880410f28..012e20e90 100644 --- a/frontend/src/app/active-sessions/active-sessions.component.ts +++ b/frontend/src/app/active-sessions/active-sessions.component.ts @@ -54,7 +54,6 @@ export class ActiveSessionsComponent implements OnInit { } uploadFileDialog(session: Session): void { - this.dialog.open(UploadDialogComponent, {data: session - }); + this.dialog.open(UploadDialogComponent, { data: session }); } } diff --git a/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.css b/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.css index e69de29bb..f7f4ea4d1 100644 --- a/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.css +++ b/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.css @@ -0,0 +1,4 @@ +/* + * Copyright DB Netz AG and the capella-collab-manager contributors + * SPDX-License-Identifier: Apache-2.0 + */ diff --git a/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.html b/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.html index 9c7c3c287..deff2df81 100644 --- a/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.html +++ b/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.html @@ -1,5 +1,18 @@ + +

-Are you sure to overwrite file {{filename}}? + Are you sure to overwrite file {{ filename }}?

- + diff --git a/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.spec.ts b/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.spec.ts index d6dbbef09..2a4606081 100644 --- a/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.spec.ts +++ b/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.spec.ts @@ -1,3 +1,6 @@ +// Copyright DB Netz AG and the capella-collab-manager contributors +// SPDX-License-Identifier: Apache-2.0 + import { ComponentFixture, TestBed } from '@angular/core/testing'; import { FileExistsDialogComponent } from './file-exists-dialog.component'; @@ -8,9 +11,8 @@ describe('FileExistsDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ FileExistsDialogComponent ] - }) - .compileComponents(); + declarations: [FileExistsDialogComponent], + }).compileComponents(); }); beforeEach(() => { diff --git a/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.ts b/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.ts index 64f676bac..f5c8694e7 100644 --- a/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.ts +++ b/frontend/src/app/active-sessions/upload-dialog/file-exists-dialog/file-exists-dialog.component.ts @@ -1,3 +1,6 @@ +// Copyright DB Netz AG and the capella-collab-manager contributors +// SPDX-License-Identifier: Apache-2.0 + import { Component, OnInit } from '@angular/core'; import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog'; import { Inject } from '@angular/core'; @@ -5,7 +8,7 @@ import { Inject } from '@angular/core'; @Component({ selector: 'app-file-exists-dialog', templateUrl: './file-exists-dialog.component.html', - styleUrls: ['./file-exists-dialog.component.css'] + styleUrls: ['./file-exists-dialog.component.css'], }) export class FileExistsDialogComponent implements OnInit { constructor( diff --git a/frontend/src/app/active-sessions/upload-dialog/upload-dialog.component.spec.ts b/frontend/src/app/active-sessions/upload-dialog/upload-dialog.component.spec.ts index e51afc1a8..1dda6b3c6 100644 --- a/frontend/src/app/active-sessions/upload-dialog/upload-dialog.component.spec.ts +++ b/frontend/src/app/active-sessions/upload-dialog/upload-dialog.component.spec.ts @@ -1,3 +1,6 @@ +// Copyright DB Netz AG and the capella-collab-manager contributors +// SPDX-License-Identifier: Apache-2.0 + import { ComponentFixture, TestBed } from '@angular/core/testing'; import { UploadDialogComponent } from './upload-dialog.component'; @@ -8,9 +11,8 @@ describe('UploadDialogComponent', () => { beforeEach(async () => { await TestBed.configureTestingModule({ - declarations: [ UploadDialogComponent ] - }) - .compileComponents(); + declarations: [UploadDialogComponent], + }).compileComponents(); }); beforeEach(() => { diff --git a/frontend/src/app/auth/http-interceptor/auth.interceptor.ts b/frontend/src/app/auth/http-interceptor/auth.interceptor.ts index 247e8b327..f2468f352 100644 --- a/frontend/src/app/auth/http-interceptor/auth.interceptor.ts +++ b/frontend/src/app/auth/http-interceptor/auth.interceptor.ts @@ -70,7 +70,7 @@ export class AuthInterceptor implements HttpInterceptor { injectAccessToken(request: HttpRequest): HttpRequest { let access_token = this.localStorageService.getValue('access_token'); return request.clone({ - headers: request.headers.set("Authorization", `Bearer ${access_token}`), + headers: request.headers.set('Authorization', `Bearer ${access_token}`), }); } diff --git a/frontend/src/app/schemes.ts b/frontend/src/app/schemes.ts index 4ebde3db3..dd0c1935e 100644 --- a/frontend/src/app/schemes.ts +++ b/frontend/src/app/schemes.ts @@ -42,4 +42,4 @@ export interface PathNode { type: 'file' | 'directory'; isNew: boolean; children: PathNode[] | null; -} \ No newline at end of file +} diff --git a/frontend/src/app/services/load-files/load-files.service.spec.ts b/frontend/src/app/services/load-files/load-files.service.spec.ts index ba277896e..1025549a3 100644 --- a/frontend/src/app/services/load-files/load-files.service.spec.ts +++ b/frontend/src/app/services/load-files/load-files.service.spec.ts @@ -1,3 +1,6 @@ +// Copyright DB Netz AG and the capella-collab-manager contributors +// SPDX-License-Identifier: Apache-2.0 + import { TestBed } from '@angular/core/testing'; import { LoadFilesService } from './load-files.service';