Merge pull request #488 from DSD-DBS/fix-git-model-creation

Fix git model creation
DSD-DBS · Jan 3, 2023 · aa0ea62 · aa0ea62
2 parents 00eda68 + 3efda5e
commit aa0ea62
Show file tree

Hide file tree

Showing 8 changed files with 53 additions and 14 deletions.
diff --git a/backend/capellacollab/projects/toolmodels/modelsources/git/routes.py b/backend/capellacollab/projects/toolmodels/modelsources/git/routes.py
@@ -176,13 +176,13 @@ def update_git_model_by_id(
 def delete_git_model_by_id(
     db_git_model: DatabaseGitModel = Depends(get_existing_git_model),
     db: Session = Depends(get_db),
-) -> DatabaseGitModel:
+):
     if get_pipelines_for_git_model(db, db_git_model):
         raise HTTPException(
             status_code=409,
             detail={
                 "err_code": "git_model_used_for_backup",
-                "reason": f"The git model can't be deleted: it's used for backup jobs",
+                "reason": "The git model can't be deleted: it's used for backup jobs",
             },
         )
 

diff --git a/frontend/src/app/app-routing.module.ts b/frontend/src/app/app-routing.module.ts
@@ -11,11 +11,11 @@ import { AuthComponent } from './general/auth/auth/auth.component';
 import { LogoutRedirectComponent } from './general/auth/logout/logout-redirect/logout-redirect.component';
 import { LogoutComponent } from './general/auth/logout/logout/logout.component';
 import { CreateProjectComponent } from './projects/create-project/create-project.component';
-import { AddGitSourceComponent } from './projects/models/add-git-source/add-git-source.component';
 import { CreateModelComponent } from './projects/models/create-model/create-model.component';
 import { ModelDescriptionComponent } from './projects/models/model-description/model-description.component';
 import { ModelDetailComponent } from './projects/models/model-detail/model-detail.component';
 import { T4cModelWrapperComponent } from './projects/models/model-detail/t4c-model-wrapper/t4c-model-wrapper.component';
+import { ManageGitModelComponent } from './projects/models/model-source/git/manage-git-model/manage-git-model.component';
 import { ManageT4CModelComponent } from './projects/models/model-source/t4c/manage-t4c-model/manage-t4c-model.component';
 import { ModelWrapperComponent } from './projects/models/model-wrapper/model-wrapper.component';
 import { ProjectDetailsComponent } from './projects/project-detail/project-details.component';
@@ -84,10 +84,10 @@ const routes: Routes = [
               {
                 path: 'git-model',
                 children: [
-                  { path: 'create', component: AddGitSourceComponent },
+                  { path: 'create', component: ManageGitModelComponent },
                   {
                     path: ':git-model',
-                    component: AddGitSourceComponent,
+                    component: ManageGitModelComponent,
                   },
                 ],
               },

diff --git a/frontend/src/app/app.module.ts b/frontend/src/app/app.module.ts
@@ -59,7 +59,6 @@ import { ButtonSkeletonLoaderComponent } from './helpers/skeleton-loaders/button
 import { FormFieldSkeletonLoaderComponent } from './helpers/skeleton-loaders/form-field-skeleton-loader/form-field-skeleton-loader.component';
 import { MatCardOverviewLoaderComponent } from './helpers/skeleton-loaders/mat-card-overview-loader/mat-card-overview-loader.component';
 import { CreateProjectComponent } from './projects/create-project/create-project.component';
-import { AddGitSourceComponent } from './projects/models/add-git-source/add-git-source.component';
 import { CreateBackupComponent } from './projects/models/backup-settings/create-backup/create-backup.component';
 import { TriggerPipelineComponent } from './projects/models/backup-settings/trigger-pipeline/trigger-pipeline.component';
 import { ViewLogsDialogComponent } from './projects/models/backup-settings/view-logs-dialog/view-logs-dialog.component';
@@ -71,6 +70,7 @@ import { ModelDescriptionComponent } from './projects/models/model-description/m
 import { ModelDetailComponent } from './projects/models/model-detail/model-detail.component';
 import { T4cModelWrapperComponent } from './projects/models/model-detail/t4c-model-wrapper/t4c-model-wrapper.component';
 import { ChooseSourceComponent } from './projects/models/model-source/choose-source.component';
+import { ManageGitModelComponent } from './projects/models/model-source/git/manage-git-model/manage-git-model.component';
 import { ManageT4CModelComponent } from './projects/models/model-source/t4c/manage-t4c-model/manage-t4c-model.component';
 import { ModelWrapperComponent } from './projects/models/model-wrapper/model-wrapper.component';
 import { ModelOverviewComponent } from './projects/project-detail/model-overview/model-overview.component';
@@ -112,7 +112,6 @@ import { HomeComponent } from './workspaces/home.component';
 @NgModule({
   declarations: [
     ActiveSessionsComponent,
-    AddGitSourceComponent,
     AlertSettingsComponent,
     AppComponent,
     AuthComponent,
@@ -140,6 +139,7 @@ import { HomeComponent } from './workspaces/home.component';
     LicencesComponent,
     LogoutComponent,
     LogoutRedirectComponent,
+    ManageGitModelComponent,
     ManageT4CModelComponent,
     MatCardOverviewLoaderComponent,
     MatIconComponent,

diff --git a/frontend/src/app/projects/models/create-model/create-model.component.html b/frontend/src/app/projects/models/create-model/create-model.component.html
@@ -24,14 +24,14 @@
 
     <mat-step label="Add source">
       <div [ngSwitch]="source">
-        <app-create-coworking-method
+        <app-manage-git-model
           *ngSwitchCase="'git-add'"
           [asStepper]="true"
           (create)="afterSourceCreated($event)"
-        ></app-create-coworking-method>
+        ></app-manage-git-model>
         <app-manage-t4c-model
-          [asStepper]="true"
           *ngSwitchCase="'t4c-add'"
+          [asStepper]="true"
           (create)="afterSourceCreated($event)"
         ></app-manage-t4c-model>
       </div>

diff --git a/...d-git-source/add-git-source.component.css → ...-git-model/manage-git-model.component.css b/...d-git-source/add-git-source.component.css → ...-git-model/manage-git-model.component.css
diff --git a/...-git-source/add-git-source.component.html → ...git-model/manage-git-model.component.html b/...-git-source/add-git-source.component.html → ...git-model/manage-git-model.component.html
diff --git a/.../app/projects/models/model-source/git/manage-git-model/manage-git-model.component.spec.ts b/.../app/projects/models/model-source/git/manage-git-model/manage-git-model.component.spec.ts
@@ -0,0 +1,29 @@
+/*
+ * SPDX-FileCopyrightText: Copyright DB Netz AG and the capella-collab-manager contributors
+ * SPDX-License-Identifier: Apache-2.0
+ */
+
+import { ComponentFixture, TestBed } from '@angular/core/testing';
+
+import { ManageGitModelComponent } from './manage-git-model.component';
+
+xdescribe('ManageGitModelComponent', () => {
+  let component: ManageGitModelComponent;
+  let fixture: ComponentFixture<ManageGitModelComponent>;
+
+  beforeEach(async () => {
+    await TestBed.configureTestingModule({
+      declarations: [ManageGitModelComponent],
+    }).compileComponents();
+  });
+
+  beforeEach(() => {
+    fixture = TestBed.createComponent(ManageGitModelComponent);
+    component = fixture.componentInstance;
+    fixture.detectChanges();
+  });
+
+  it('should create', () => {
+    expect(component).toBeTruthy();
+  });
+});
diff --git a/...dd-git-source/add-git-source.component.ts → ...e-git-model/manage-git-model.component.ts b/...dd-git-source/add-git-source.component.ts → ...e-git-model/manage-git-model.component.ts
@@ -48,11 +48,11 @@ import {
 } from 'src/app/services/settings/git-settings.service';
 
 @Component({
-  selector: 'app-create-coworking-method',
-  templateUrl: './add-git-source.component.html',
-  styleUrls: ['./add-git-source.component.css'],
+  selector: 'app-manage-git-model',
+  templateUrl: './manage-git-model.component.html',
+  styleUrls: ['./manage-git-model.component.css'],
 })
-export class AddGitSourceComponent implements OnInit, OnDestroy {
+export class ManageGitModelComponent implements OnInit, OnDestroy {
   @Input() asStepper?: boolean;
   @Output() create = new EventEmitter<boolean>();
 
@@ -133,6 +133,8 @@ export class AddGitSourceComponent implements OnInit, OnDestroy {
           this.form.controls.urls.setAsyncValidators([
             this.resultUrlPrefixAsyncValidator(),
           ]);
+        } else {
+          this.urls.inputUrl.addValidators([Validators.required]);
         }
       });
 
@@ -224,6 +226,14 @@ export class AddGitSourceComponent implements OnInit, OnDestroy {
     this.updateResultUrl();
     this.resetRevisions();
 
+    if (!this.availableGitInstances.length) {
+      if (this.form.controls.urls.controls.inputUrl.valid) {
+        this.enableAllExceptUrls();
+      } else {
+        this.disableAllExpectUrls();
+      }
+    }
+
     this.urls.inputUrl.updateValueAndValidity();
 
     if (changedInputUrl && hasAbsoluteUrlPrefix(changedInputUrl)) {