Fix changing unversioned definitions

eclipse · Apr 25, 2018 · 58ce1dd · koppor · Apr 26, 2018 · lharzenetter
1 parent e415d55
commit 58ce1dd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 7 deletions.
diff --git a/org.eclipse.winery.common/src/main/java/org/eclipse/winery/common/version/VersionUtils.java b/org.eclipse.winery.common/src/main/java/org/eclipse/winery/common/version/VersionUtils.java
@@ -47,7 +47,7 @@
  */
 public class VersionUtils {
 
-    public static final Pattern VERSION_PATTERN = Pattern.compile("_([^_]*)-w([0-9]+)(-wip([0-9]+))?$");
+    private static final Pattern VERSION_PATTERN = Pattern.compile("_([^_]*)-w([0-9]+)(-wip([0-9]+))?$");
 
     private static String REFERENCING_OBJECT = "referencingObject";
 

diff --git a/org.eclipse.winery.common/src/main/java/org/eclipse/winery/common/version/WineryVersion.java b/org.eclipse.winery.common/src/main/java/org/eclipse/winery/common/version/WineryVersion.java
@@ -43,7 +43,8 @@ public WineryVersion(String componentVersion, int wineryVersion, int workInProgr
         this.workInProgressVersion = Math.abs(workInProgressVersion);
         this.latestVersion = false;
         this.releasable = false;
-        this.editable = false;
+        // to support editing of not versioned definitions
+        this.editable = !this.isVersionedInWinery();;
     }
 
     public String getComponentVersion() {

diff --git a/org.eclipse.winery.repository.ui/src/app/instance/instance.component.ts b/org.eclipse.winery.repository.ui/src/app/instance/instance.component.ts
@@ -59,7 +59,7 @@ export class InstanceComponent implements OnDestroy {
             .data
             .subscribe(data => {
                     this.newVersionAvailable = false;
-                    this.editable = false;
+                    this.editable = !this.editable;
                     this.toscaComponent = data['resolveData'] ? data['resolveData'] : new ToscaComponent(ToscaTypes.Admin, '', '');
 
                     this.service.setSharedData(this.toscaComponent);

diff --git a/org.eclipse.winery.repository.ui/src/app/wineryAddComponentModule/addComponent.component.ts b/org.eclipse.winery.repository.ui/src/app/wineryAddComponentModule/addComponent.component.ts
@@ -31,6 +31,10 @@ import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import { ExistService } from '../wineryUtils/existService';
 import { catchError, retry } from 'rxjs/operators';
 
+export function getToolTip(): TooltipConfig {
+    return Object.assign(new TooltipConfig(), { placement: 'right' });
+}
+
 @Component({
     selector: 'winery-add-component',
     templateUrl: 'addComponent.component.html',
@@ -39,9 +43,7 @@ import { catchError, retry } from 'rxjs/operators';
         InheritanceService,
         {
             provide: TooltipConfig,
-            useFactory: () => {
-                return Object.assign(new TooltipConfig(), { placement: 'right' });
-            }
+            useFactory: getToolTip
         }
     ]
 })

diff --git a/...t/java/org/eclipse/winery/repository/backend/BackendUtilsTestWithGitBackedRepository.java b/...t/java/org/eclipse/winery/repository/backend/BackendUtilsTestWithGitBackedRepository.java
@@ -155,7 +155,8 @@ public void getVersionWithEditableFlagFromComponentWithoutAVersion() throws Exce
 
         List<WineryVersion> versions = BackendUtils.getAllVersionsOfOneDefinition(policyTemplateId);
 
-        Assert.assertFalse(versions.get(0).isEditable());
+        // For continence, we accept editing already existing components
+        Assert.assertTrue(versions.get(0).isEditable());
     }
 
     @Test