From 3ffbf1c42ee197ae83625dc51b760a8420d73d7d Mon Sep 17 00:00:00 2001 From: dominik003 Date: Tue, 24 Jan 2023 18:18:50 +0100 Subject: [PATCH 01/15] chore: Adjust imports This corrects some imports that were changed due to the relocation of some components and services. --- frontend/src/app/app.module.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts index 610912616d..6d2d39bafe 100644 --- a/frontend/src/app/app.module.ts +++ b/frontend/src/app/app.module.ts @@ -93,6 +93,7 @@ import { CreatePersistentSessionComponent } from './sessions/create-persistent-s import { DeleteSessionDialogComponent } from './sessions/delete-session-dialog/delete-session-dialog.component'; import { NewReadonlyModelOptionsComponent } from './sessions/new-readonly-session-dialog/new-readonly-model-options/new-readonly-model-options.component'; import { NewReadonlySessionDialogComponent } from './sessions/new-readonly-session-dialog/new-readonly-session-dialog.component'; +import { PersistentSessionComponent } from './sessions/persistent-session/persistent-session.component'; import { GuacamoleComponent } from './sessions/session-created/guacamole/guacamole.component'; import { SessionOverviewComponent } from './sessions/session-overview/session-overview.component'; import { SessionsComponent } from './sessions/sessions.component'; @@ -164,6 +165,7 @@ import { SettingsComponent } from './settings/settings.component'; NewReadonlyModelOptionsComponent, NewReadonlySessionDialogComponent, NoticeComponent, + PersistentSessionComponent, ProjectDetailsComponent, ProjectMetadataComponent, ProjectOverviewComponent, From c622ed932551c85d3565de1b3bf7d9de6c8757e7 Mon Sep 17 00:00:00 2001 From: dominik003 Date: Tue, 31 Jan 2023 18:16:46 +0100 Subject: [PATCH 02/15] feat: Add until-destroy --- frontend/package-lock.json | 29 ++++++++++++++++++++++++++--- frontend/package.json | 1 + 2 files changed, 27 insertions(+), 3 deletions(-) diff --git a/frontend/package-lock.json b/frontend/package-lock.json index 1a483476f4..1479f96156 100644 --- a/frontend/package-lock.json +++ b/frontend/package-lock.json @@ -18,6 +18,7 @@ "@angular/platform-browser": "~15.1.2", "@angular/platform-browser-dynamic": "~15.1.2", "@angular/router": "~15.1.2", + "@ngneat/until-destroy": "^9.2.3", "@types/semver": "^7.3.13", "buffer": "^6.0.3", "file-saver": "^2.0.5", @@ -3775,6 +3776,18 @@ "tslib": "^2.1.0" } }, + "node_modules/@ngneat/until-destroy": { + "version": "9.2.3", + "resolved": "https://registry.npmjs.org/@ngneat/until-destroy/-/until-destroy-9.2.3.tgz", + "integrity": "sha512-ryX0vqDOdmYo53f7v5Ivbj1jcqOEX+vM1iiV9NYepWDha4VJp9lWrDFK9tRt2evAMzF/9u67JLzs4Xjcoh+Taw==", + "dependencies": { + "tslib": "^2.3.0" + }, + "peerDependencies": { + "@angular/core": ">=13", + "rxjs": "^6.4.0 || ^7.0.0" + } + }, "node_modules/@ngtools/webpack": { "version": "15.1.3", "resolved": "https://registry.npmjs.org/@ngtools/webpack/-/webpack-15.1.3.tgz", @@ -5168,6 +5181,7 @@ "version": "3.2.1", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, "dependencies": { "color-convert": "^1.9.0" }, @@ -5903,6 +5917,7 @@ "version": "2.4.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, "dependencies": { "ansi-styles": "^3.2.1", "escape-string-regexp": "^1.0.5", @@ -6080,6 +6095,7 @@ "version": "1.9.3", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, "dependencies": { "color-name": "1.1.3" } @@ -6087,7 +6103,8 @@ "node_modules/color-name": { "version": "1.1.3", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", - "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==" + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true }, "node_modules/color-support": { "version": "1.1.3", @@ -7307,6 +7324,7 @@ "version": "1.0.5", "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, "engines": { "node": ">=0.8.0" } @@ -8831,6 +8849,7 @@ "version": "3.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, "engines": { "node": ">=4" } @@ -10138,7 +10157,8 @@ "node_modules/json-parse-even-better-errors": { "version": "2.3.1", "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==" + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true }, "node_modules/json-parse-helpfulerror": { "version": "1.0.3", @@ -11398,6 +11418,7 @@ "version": "0.5.6", "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz", "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==", + "dev": true, "dependencies": { "minimist": "^1.2.6" }, @@ -16959,6 +16980,7 @@ "version": "5.5.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, "dependencies": { "has-flag": "^3.0.0" }, @@ -17203,7 +17225,8 @@ "node_modules/text-table": { "version": "0.2.0", "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", - "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==" + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true }, "node_modules/through": { "version": "2.3.8", diff --git a/frontend/package.json b/frontend/package.json index ba251f0ac8..bb179ceddb 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -23,6 +23,7 @@ "@angular/platform-browser": "~15.1.2", "@angular/platform-browser-dynamic": "~15.1.2", "@angular/router": "~15.1.2", + "@ngneat/until-destroy": "^9.2.3", "@types/semver": "^7.3.13", "buffer": "^6.0.3", "file-saver": "^2.0.5", From e25991c07a33c393967b39b9c534c8819a7a0933 Mon Sep 17 00:00:00 2001 From: dominik003 Date: Tue, 31 Jan 2023 18:18:08 +0100 Subject: [PATCH 03/15] feat: Apply new fetching approach to projects --- .../app/helpers/validators/slug-validator.ts | 25 +++ .../create-project.component.html | 9 +- .../create-project.component.spec.ts | 59 +++---- .../create-project.component.ts | 70 +++------ .../create-backup/create-backup.component.ts | 43 +++-- .../trigger-pipeline.component.ts | 51 +++--- .../view-logs-dialog.component.ts | 4 +- .../choose-init/choose-init.component.html | 2 +- .../create-model-base.component.html | 2 +- .../create-model-base.component.ts | 63 ++++---- .../create-model/create-model.component.ts | 20 ++- .../models/init-model/init-model.component.ts | 33 ++-- .../model-description.component.ts | 59 +++---- .../model-detail/model-detail.component.html | 5 +- .../model-detail/model-detail.component.ts | 30 ++-- .../t4c-model-wrapper.component.ts | 4 +- .../model-restrictions.component.ts | 8 +- .../model-source/choose-source.component.html | 2 +- .../manage-git-model.component.html | 4 +- .../manage-git-model.component.ts | 124 ++++++++------- .../manage-t4c-model.component.html | 2 +- .../manage-t4c-model.component.ts | 16 +- .../model-wrapper/model-wrapper.component.ts | 10 +- .../model-overview.component.ts | 3 +- .../project-details.component.html | 15 +- .../project-details.component.ts | 8 +- .../project-metadata.component.ts | 45 ++---- .../project-overview.component.html | 6 +- .../project-overview.component.ts | 7 +- .../project-wrapper.component.ts | 31 ++-- .../projects/service/project.service.spec.ts | 147 ------------------ .../app/projects/service/project.service.ts | 89 ++++++----- 32 files changed, 433 insertions(+), 563 deletions(-) delete mode 100644 frontend/src/app/projects/service/project.service.spec.ts diff --git a/frontend/src/app/helpers/validators/slug-validator.ts b/frontend/src/app/helpers/validators/slug-validator.ts index d49deaffd7..9814ed8461 100644 --- a/frontend/src/app/helpers/validators/slug-validator.ts +++ b/frontend/src/app/helpers/validators/slug-validator.ts @@ -2,3 +2,28 @@ * SPDX-FileCopyrightText: Copyright DB Netz AG and the capella-collab-manager contributors * SPDX-License-Identifier: Apache-2.0 */ + +import { + AbstractControl, + AsyncValidatorFn, + ValidationErrors, +} from '@angular/forms'; +import { map, Observable, take } from 'rxjs'; +import slugify from 'slugify'; +import { Project } from 'src/app/projects/service/project.service'; + +export function asyncProjectSlugValidator( + projectObservable: Observable +): AsyncValidatorFn { + return (control: AbstractControl): Observable => { + const projectSlug = slugify(control.value, { lower: true }); + return projectObservable.pipe( + take(1), + map((projects) => { + return projects?.find((project) => project.slug === projectSlug) + ? { uniqueSlug: { value: projectSlug } } + : null; + }) + ); + }; +} diff --git a/frontend/src/app/projects/create-project/create-project.component.html b/frontend/src/app/projects/create-project/create-project.component.html index 750dbfb29a..dba9f0c55b 100644 --- a/frontend/src/app/projects/create-project/create-project.component.html +++ b/frontend/src/app/projects/create-project/create-project.component.html @@ -66,10 +66,10 @@ -
+
@@ -100,7 +100,10 @@
diff --git a/frontend/src/app/projects/create-project/create-project.component.spec.ts b/frontend/src/app/projects/create-project/create-project.component.spec.ts index 4dff634159..99101471b2 100644 --- a/frontend/src/app/projects/create-project/create-project.component.spec.ts +++ b/frontend/src/app/projects/create-project/create-project.component.spec.ts @@ -22,7 +22,11 @@ import { } from 'src/../tests/spec-helper/element.spec-helper'; import { ToastService } from '../../helpers/toast/toast.service'; -import { Project, ProjectService } from '../service/project.service'; +import { + PatchProject, + Project, + ProjectService, +} from '../service/project.service'; import { CreateProjectComponent } from './create-project.component'; const mockProjects: Project[] = [ @@ -50,31 +54,34 @@ describe('CreateProjectComponent', () => { showSuccess(): void {}, }; - const fakeProjectService: Pick< - ProjectService, - '_project' | '_projects' | 'list' | 'createProject' | 'project' | 'projects' - > = { + const fakeProjectService = { _project: new BehaviorSubject(undefined), _projects: new BehaviorSubject(undefined), - list() { + + get project(): Observable { + return this._project.asObservable(); + }, + + get projects(): Observable { + return this._projects.asObservable(); + }, + + loadProjects() { this._projects.next(mockProjects); return of(mockProjects); }, - createProject(project: Project): Observable { + createProject(project: PatchProject): Observable { let projectToCreate: Project = { - name: project.name, - description: project.description, - slug: project.name, + name: project.name!, + description: project.description!, + slug: project.name!, users: { leads: 1, contributors: 0, subscribers: 0 }, }; this._project.next(projectToCreate); return of(projectToCreate); }, - get projects(): Project[] | undefined { - return this._projects.value; - }, - get project(): Project | undefined { - return this._project.value; + clearProject(): void { + this._project.next(undefined); }, }; @@ -129,13 +136,10 @@ describe('CreateProjectComponent', () => { fixture.detectChanges(); - expect(fakeProjectService.createProject).toHaveBeenCalledOnceWith( - { - name: testProjectName, - description: '', - }, - true - ); + expect(fakeProjectService.createProject).toHaveBeenCalledOnceWith({ + name: testProjectName, + description: '', + }); expect(fakeToastService.showSuccess).toHaveBeenCalledTimes(1); }); @@ -149,13 +153,10 @@ describe('CreateProjectComponent', () => { fixture.detectChanges(); - expect(fakeProjectService.createProject).toHaveBeenCalledOnceWith( - { - name: testProjectName, - description: testProjectDescription, - }, - true - ); + expect(fakeProjectService.createProject).toHaveBeenCalledOnceWith({ + name: testProjectName, + description: testProjectDescription, + }); expect(fakeToastService.showSuccess).toHaveBeenCalledTimes(1); }); diff --git a/frontend/src/app/projects/create-project/create-project.component.ts b/frontend/src/app/projects/create-project/create-project.component.ts index bba0e18846..7008b952ff 100644 --- a/frontend/src/app/projects/create-project/create-project.component.ts +++ b/frontend/src/app/projects/create-project/create-project.component.ts @@ -4,17 +4,8 @@ */ import { Component, OnDestroy, OnInit, ViewChild } from '@angular/core'; -import { - AbstractControl, - FormControl, - FormGroup, - ValidationErrors, - ValidatorFn, - Validators, -} from '@angular/forms'; import { MatStepper } from '@angular/material/stepper'; -import { Router } from '@angular/router'; -import slugify from 'slugify'; +import { asyncProjectSlugValidator } from 'src/app/helpers/validators/slug-validator'; import { CreateModelComponent, CreateModelStep, @@ -30,41 +21,41 @@ import { ProjectService } from '../service/project.service'; export class CreateProjectComponent implements OnInit, OnDestroy { @ViewChild('model_creator') model_creator!: CreateModelComponent; - private projectDetails = false; - public modelCreationStep: CreateModelStep = 'create-model'; + constructor( + public projectService: ProjectService, + private toastService: ToastService, + private navBarService: NavBarService + ) { + this.navBarService.title = 'Create Project'; + } + form = new FormGroup({ - name: new FormControl('', [Validators.required, this.slugValidator()]), + name: new FormControl('', { + validators: [Validators.required], + asyncValidators: [ + asyncProjectSlugValidator(this.projectService.projects), + ], + }), description: new FormControl(''), }); - constructor( - public projectService: ProjectService, - private router: Router, - private toastService: ToastService - ) {} - ngOnInit(): void { - this.projectService.list().subscribe(); + this.projectService.loadProjects(); } ngOnDestroy(): void { - if (!this.projectDetails) { - this.projectService._project.next(undefined); - } + this.projectService.clearProject(); } createProject(stepper: MatStepper): void { if (this.form.valid) { this.projectService - .createProject( - { - name: this.form.value.name!, - description: this.form.value.description!, - }, - true - ) + .createProject({ + name: this.form.value.name!, + description: this.form.value.description!, + }) .subscribe((project) => { this.toastService.showSuccess( `The project “${project.name}” was successfuly created.`, @@ -77,25 +68,6 @@ export class CreateProjectComponent implements OnInit, OnDestroy { } } - finish(): void { - this.projectDetails = true; - this.router.navigate(['/project', this.projectService.project!.slug]); - } - - slugValidator(): ValidatorFn { - return (control: AbstractControl): ValidationErrors | null => { - const slug = slugify(control.value, { lower: true }); - if ( - this.projectService.projects - ?.map((project) => project.slug) - .includes(slug) - ) { - return { uniqueSlug: { value: slug } }; - } - return null; - }; - } - getColorByModelCreationStep(): string { switch (this.modelCreationStep) { case 'create-model': diff --git a/frontend/src/app/projects/models/backup-settings/create-backup/create-backup.component.ts b/frontend/src/app/projects/models/backup-settings/create-backup/create-backup.component.ts index 5af4bcadd2..5a0c6ca0cd 100644 --- a/frontend/src/app/projects/models/backup-settings/create-backup/create-backup.component.ts +++ b/frontend/src/app/projects/models/backup-settings/create-backup/create-backup.component.ts @@ -12,6 +12,7 @@ import { ValidatorFn, } from '@angular/forms'; import { MatDialogRef } from '@angular/material/dialog'; +import { UntilDestroy } from '@ngneat/until-destroy'; import { combineLatest } from 'rxjs'; import { BackupService, @@ -22,6 +23,7 @@ import { ModelService } from 'src/app/projects/models/service/model.service'; import { GitModelService } from 'src/app/projects/project-detail/model-overview/model-detail/git-model.service'; import { ProjectService } from 'src/app/projects/service/project.service'; +@UntilDestroy({ checkProperties: true }) @Component({ selector: 'app-create-backup', templateUrl: './create-backup.component.html', @@ -30,6 +32,9 @@ import { ProjectService } from 'src/app/projects/service/project.service'; export class CreateBackupComponent { t4cAndGitModelExists = false; + private projectSlug?: string = undefined; // TODO: Check if I can removed them somehow + private modelSlug?: string = undefined; // TODO: Check if I can removed them somehow + constructor( public gitModelService: GitModelService, public t4cModelService: T4CModelService, @@ -38,24 +43,27 @@ export class CreateBackupComponent { private projectService: ProjectService, private modelService: ModelService ) { - this.t4cModelService - .listT4CModels( - this.projectService.project!.slug, - this.modelService.model!.slug - ) - .subscribe(); + // TODO: Try to further simplify when model service is also refactored + combineLatest([ + this.projectService.project, + this.modelService._model.asObservable(), + ]).subscribe(([project, model]) => { + this.projectSlug = project?.slug; + this.modelSlug = model?.slug; - this.gitModelService.loadGitModels( - this.projectService.project!.slug, - this.modelService.model!.slug - ); + this.t4cModelService + .listT4CModels(project!.slug, model!.slug) + .subscribe(); + this.gitModelService.loadGitModels(project!.slug, model!.slug); + }); combineLatest([ this.gitModelService.gitModels, this.t4cModelService._t4cModels.asObservable(), - ]).subscribe(([gitModels, t4cModels]) => { - this.t4cAndGitModelExists = !!(gitModels?.length && t4cModels?.length); - }); + ]).subscribe( + ([gitModels, t4cModels]) => + (this.t4cAndGitModelExists = !!(gitModels?.length && t4cModels?.length)) + ); } createBackupForm = new FormGroup({ @@ -77,7 +85,8 @@ export class CreateBackupComponent { } createGitBackup() { - if (this.createBackupForm.valid) { + // TODO: Check if model slug and project slug is needed here + if (this.createBackupForm.valid && this.modelSlug && this.projectSlug) { const formValue = this.createBackupForm.value; const createBackupformValue: PostPipeline = { gitmodelId: formValue.gitmodel![0], @@ -87,9 +96,9 @@ export class CreateBackupComponent { }; this.backupService .createBackup( - this.projectService.project!.slug, - this.modelService.model!.slug, - createBackupformValue as unknown as PostPipeline + this.projectSlug, + this.modelSlug, + createBackupformValue as PostPipeline ) .subscribe(() => { this.dialogRef.close(true); diff --git a/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.ts b/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.ts index a24219e9b3..effaff0de3 100644 --- a/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.ts +++ b/frontend/src/app/projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component.ts @@ -10,6 +10,8 @@ import { MatDialogRef, MAT_DIALOG_DATA, } from '@angular/material/dialog'; +import { UntilDestroy } from '@ngneat/until-destroy'; +import { combineLatest } from 'rxjs'; import { ToastService } from 'src/app/helpers/toast/toast.service'; import { Model, @@ -21,6 +23,7 @@ import { CreateBackupComponent } from '../create-backup/create-backup.component' import { BackupService, Pipeline } from '../service/backup.service'; import { ViewLogsDialogComponent } from '../view-logs-dialog/view-logs-dialog.component'; +@UntilDestroy({ checkProperties: true }) @Component({ selector: 'app-trigger-pipeline', templateUrl: './trigger-pipeline.component.html', @@ -29,6 +32,9 @@ import { ViewLogsDialogComponent } from '../view-logs-dialog/view-logs-dialog.co export class TriggerPipelineComponent implements OnInit { selectedPipeline?: Pipeline = undefined; + private projectSlug?: string = undefined; + private modelSlug?: string = undefined; + configurationForm = new FormGroup({ includeHistory: new FormControl(false), }); @@ -46,12 +52,15 @@ export class TriggerPipelineComponent implements OnInit { ngOnInit(): void { this.modelService._model.next(this.data.model); - this.backupService - .getBackups( - this.projectService.project!.slug, - this.modelService.model!.slug - ) - .subscribe(); + + combineLatest([ + this.projectService.project, + this.modelService._model.asObservable(), + ]).subscribe(([project, model]) => { + this.projectSlug = project?.slug; + this.modelSlug = model?.slug; + this.backupService.getBackups(project!.slug, model!.slug).subscribe(); // TODO: Check if we can actually use !. here + }); } selectPipeline(pipeline: Pipeline) { @@ -61,8 +70,8 @@ export class TriggerPipelineComponent implements OnInit { runPipeline() { this.backupService .triggerRun( - this.projectService.project!.slug, - this.modelService.model!.slug, + this.projectSlug!, // TODO: Check if we can actually use ! here + this.modelSlug!, // TODO: Check if we can actually use ! here this.selectedPipeline!.id, this.configurationForm.value.includeHistory! ) @@ -71,16 +80,15 @@ export class TriggerPipelineComponent implements OnInit { 'Pipeline triggered', 'You can check the current status in the pipeline settings.' ); - this.dialogRef.close(); + this.closeDialog(); }); } estimateTime(): string { if (this.configurationForm.value.includeHistory) { return '1-6 hours'; - } else { - return '5-10 minutes'; } + return '5-10 minutes'; } closeDialog(): void { @@ -89,43 +97,34 @@ export class TriggerPipelineComponent implements OnInit { removeBackup(backup: Pipeline): void { this.backupService - .removeBackup( - this.projectService.project!.slug, - this.modelService.model!.slug, - backup.id - ) + .removeBackup(this.projectSlug!, this.modelSlug!, backup.id) // TODO: Check if we can actually use ! here .subscribe(() => { this.toastService.showSuccess( 'Backup pipeline deleted', `The pipeline with the ID ${backup.id} has been deleted` ); - this.dialogRef.close(); + this.closeDialog(); }); } viewLogs(backup: Pipeline): void { this.dialog.open(ViewLogsDialogComponent, { data: { - modelSlug: this.modelService.model!.slug, + projectSlug: this.projectSlug!, // TODO: Check if we can actually use ! here + modelSlug: this.modelSlug!, // TODO: Check if we can actually use ! here job_id: backup.lastrun.id, backup_id: backup.id, - project: this.projectService.project!.slug, }, }); } createNewBackup(): void { - const dialogRef = this.dialog.open(CreateBackupComponent, { - data: { project: this.projectService.project!.slug }, - }); + const dialogRef = this.dialog.open(CreateBackupComponent); dialogRef.afterClosed().subscribe((success) => { if (success) { this.backupService - .getBackups( - this.projectService.project!.slug, - this.modelService.model!.slug - ) + .getBackups(this.projectSlug!, this.modelSlug!) // TODO: Check if we can actually use ! here .subscribe(); } }); diff --git a/frontend/src/app/projects/models/backup-settings/view-logs-dialog/view-logs-dialog.component.ts b/frontend/src/app/projects/models/backup-settings/view-logs-dialog/view-logs-dialog.component.ts index a3c0d278f6..af285ba00a 100644 --- a/frontend/src/app/projects/models/backup-settings/view-logs-dialog/view-logs-dialog.component.ts +++ b/frontend/src/app/projects/models/backup-settings/view-logs-dialog/view-logs-dialog.component.ts @@ -44,7 +44,7 @@ export class ViewLogsDialogComponent implements OnInit, OnDestroy { refreshLogs(): void { this.loading = true; this.easeBackupService - .getLogs(this.data.project, this.data.backup_id, this.data.modelSlug) + .getLogs(this.data.projectSlug, this.data.backup_id, this.data.modelSlug) .subscribe({ next: (res: string) => { this.loading = false; @@ -59,8 +59,8 @@ export class ViewLogsDialogComponent implements OnInit, OnDestroy { } export type ViewLogsData = { + projectSlug: string; modelSlug: string; job_id: string; backup_id: number; - project: string; }; diff --git a/frontend/src/app/projects/models/choose-init/choose-init.component.html b/frontend/src/app/projects/models/choose-init/choose-init.component.html index 778b953748..7c56845f74 100644 --- a/frontend/src/app/projects/models/choose-init/choose-init.component.html +++ b/frontend/src/app/projects/models/choose-init/choose-init.component.html @@ -3,7 +3,7 @@ ~ SPDX-License-Identifier: Apache-2.0 --> -
+
-
+

Team4Capella sources

diff --git a/frontend/src/app/settings/modelsources/git-settings/edit-git-settings/edit-git-settings.component.ts b/frontend/src/app/settings/modelsources/git-settings/edit-git-settings/edit-git-settings.component.ts index 0c39a0c485..9ba4e6c565 100644 --- a/frontend/src/app/settings/modelsources/git-settings/edit-git-settings/edit-git-settings.component.ts +++ b/frontend/src/app/settings/modelsources/git-settings/edit-git-settings/edit-git-settings.component.ts @@ -23,7 +23,7 @@ import { export class EditGitSettingsComponent implements OnInit, OnDestroy { id: number = -1; - gitSettingsForm = new FormGroup({ + gitInstanceForm = new FormGroup({ type: new FormControl('', Validators.required), name: new FormControl('', Validators.required), url: new FormControl('', Validators.required), @@ -33,22 +33,22 @@ export class EditGitSettingsComponent implements OnInit, OnDestroy { constructor( private router: Router, private route: ActivatedRoute, - private gitSettingsService: GitInstancesService, + private gitInstancesService: GitInstancesService, private breadcrumbsService: BreadcrumbsService ) {} ngOnInit(): void { - this.gitSettingsService.gitInstance + this.gitInstancesService.gitInstance .pipe(filter(Boolean), untilDestroyed(this)) .subscribe((instance: GitInstance) => { - this.gitSettingsForm.patchValue(instance); + this.gitInstanceForm.patchValue(instance); this.breadcrumbsService.updatePlaceholder({ gitInstance: instance }); }); this.route.params.pipe(untilDestroyed(this)).subscribe((params) => { this.id = params['id']; if (!!this.id) { - this.gitSettingsService.loadGitInstanceById(this.id); + this.gitInstancesService.loadGitInstanceById(this.id); } }); } @@ -57,10 +57,10 @@ export class EditGitSettingsComponent implements OnInit, OnDestroy { this.breadcrumbsService.updatePlaceholder({ gitInstance: undefined }); } - editGitSettings() { - this.gitSettingsService + editGitInstance() { + this.gitInstancesService .editGitInstance({ - ...this.gitSettingsForm.value, + ...this.gitInstanceForm.value, id: this.id, } as GitInstance) .subscribe((_) => this.goBack()); diff --git a/frontend/src/app/settings/modelsources/git-settings/git-settings.component.html b/frontend/src/app/settings/modelsources/git-settings/git-settings.component.html index 1a046af961..89577a0614 100644 --- a/frontend/src/app/settings/modelsources/git-settings/git-settings.component.html +++ b/frontend/src/app/settings/modelsources/git-settings/git-settings.component.html @@ -4,11 +4,11 @@ -->
-
+
Existing instances
-
- +
+
{{ instance.name }} @@ -21,7 +21,7 @@ > settings -
@@ -88,7 +88,7 @@ diff --git a/frontend/src/app/settings/modelsources/git-settings/git-settings.component.ts b/frontend/src/app/settings/modelsources/git-settings/git-settings.component.ts index be4d474b33..5664887755 100644 --- a/frontend/src/app/settings/modelsources/git-settings/git-settings.component.ts +++ b/frontend/src/app/settings/modelsources/git-settings/git-settings.component.ts @@ -30,7 +30,7 @@ import { styleUrls: ['./git-settings.component.css'], }) export class GitSettingsComponent implements OnInit { - public availableGitSettings: GitInstance[] = []; + public availableGitInstances: GitInstance[] = []; gitInstancesForm = new FormGroup({ type: new FormControl('', Validators.required), @@ -40,29 +40,29 @@ export class GitSettingsComponent implements OnInit { }); constructor( - private gitSettingsService: GitInstancesService, public dialog: MatDialog, - public dialogRef: MatDialogRef + public dialogRef: MatDialogRef, + private gitInstancesService: GitInstancesService ) {} ngOnInit(): void { - this.gitSettingsService.gitInstances + this.gitInstancesService.gitInstances .pipe(filter(Boolean), untilDestroyed(this)) .subscribe((gitInstances) => { - this.availableGitSettings = gitInstances; + this.availableGitInstances = gitInstances; }); - this.gitSettingsService.loadGitInstances(); + this.gitInstancesService.loadGitInstances(); } - createGitSettings(): void { + createGitInstance(): void { if (this.gitInstancesForm.valid) { let url = this.gitInstancesForm.value.url!; if (url.endsWith('/')) { url = url.slice(0, -1); } - this.gitSettingsService + this.gitInstancesService .createGitInstance({ name: this.gitInstancesForm.value.name!, url: url, @@ -73,30 +73,30 @@ export class GitSettingsComponent implements OnInit { } } - deleteGitSettings(id: number): void { - const toDeleteGitSetting: GitInstance = this.availableGitSettings.find( - (gitSetting) => gitSetting.id == id + deleteGitInstance(id: number): void { + const toDeleteGitInstance: GitInstance = this.availableGitInstances.find( + (gitInstance) => gitInstance.id == id )!; this.dialog .open(DeleteGitSettingsDialogComponent, { - data: toDeleteGitSetting, + data: toDeleteGitInstance, }) .afterClosed() .subscribe((response) => { if (response) { - this.gitSettingsService.deleteGitInstance(id).subscribe(); + this.gitInstancesService.deleteGitInstance(id).subscribe(); } }); } nameValidator(): ValidatorFn { return (control: AbstractControl): ValidationErrors | null => { - const existingGitSetting = this.availableGitSettings.find( - (gitSetting) => gitSetting.name == control.value + const existingGitInstance = this.availableGitInstances.find( + (gitInstance) => gitInstance.name == control.value ); - if (existingGitSetting) { - return { uniqueName: { value: existingGitSetting.name } }; + if (existingGitInstance) { + return { uniqueName: { value: existingGitInstance.name } }; } return null; }; diff --git a/frontend/src/app/settings/modelsources/git-settings/service/git-instances.service.ts b/frontend/src/app/settings/modelsources/git-settings/service/git-instances.service.ts index 85babe6a3e..a2c3e5df70 100644 --- a/frontend/src/app/settings/modelsources/git-settings/service/git-instances.service.ts +++ b/frontend/src/app/settings/modelsources/git-settings/service/git-instances.service.ts @@ -37,7 +37,7 @@ export class GitInstancesService { ); }) ) - .subscribe((gitSettings) => this._gitInstances.next(gitSettings)); + .subscribe((gitInstance) => this._gitInstances.next(gitInstance)); } transformGitInstance( @@ -52,7 +52,7 @@ export class GitInstancesService { loadGitInstanceById(id: number): void { this.http .get(this.BACKEND_URL_PREFIX + '/' + id) - .subscribe((gitSetting) => this._gitInstance.next(gitSetting)); + .subscribe((gitInstance) => this._gitInstance.next(gitInstance)); } createGitInstance(gitInstance: BasicGitInstance): Observable { From bb530f494cf7c03c0ef02647cee32c3da238340d Mon Sep 17 00:00:00 2001 From: dominik003 Date: Thu, 16 Feb 2023 12:03:51 +0100 Subject: [PATCH 14/15] fix: Exclude own project slug in slug validator --- .../project-metadata.component.html | 7 +++-- .../project-metadata.component.ts | 31 +++++++++---------- .../app/projects/service/project.service.ts | 8 +++-- 3 files changed, 24 insertions(+), 22 deletions(-) diff --git a/frontend/src/app/projects/project-detail/project-metadata/project-metadata.component.html b/frontend/src/app/projects/project-detail/project-metadata/project-metadata.component.html index acd1405a7c..843c0908ea 100644 --- a/frontend/src/app/projects/project-detail/project-metadata/project-metadata.component.html +++ b/frontend/src/app/projects/project-detail/project-metadata/project-metadata.component.html @@ -17,7 +17,8 @@

Metadata

A project with a similar name already exists. - If you proceed, the project slug will be changed to {{ newSlug }} - Please make sure to update all references.Metadata rows="3" style="resize: none" [placeholder]=" - 'This is the description of the project ' + projectName + 'This is the description of the project ' + project?.name " > @@ -55,7 +56,7 @@

Metadata