Fix integration of "Compliance Checking"

eclipse · Mar 20, 2018 · 0ba12b6 · 0ba12b6
1 parent 5c67783
commit 0ba12b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/...rg/eclipse/winery/repository/rest/resources/servicetemplates/ServiceTemplateResource.java b/...rg/eclipse/winery/repository/rest/resources/servicetemplates/ServiceTemplateResource.java
@@ -289,10 +289,10 @@ public Response injectNodeTemplates(InjectorReplaceData injectorReplaceData, @Co
         return Response.created(url).build();
     }
 
-    @Path("checking/")
+    @Path("constraintchecking/")
     @Produces(MediaType.APPLICATION_XML)
     @POST
-    public Response compliancechecking(@Context UriInfo uriInfo) {
+    public Response complianceChecking(@Context UriInfo uriInfo) {
         ServiceTemplateComplianceRuleRuleChecker checker = new ServiceTemplateComplianceRuleRuleChecker(this.getServiceTemplate());
         ServiceTemplateCheckingResult serviceTemplateCheckingResult = checker.checkComplianceRules();
         return Response.ok().entity(serviceTemplateCheckingResult).build();

diff --git a/org.eclipse.winery.repository.ui/src/app/instance/instance.service.ts b/org.eclipse.winery.repository.ui/src/app/instance/instance.service.ts
@@ -47,7 +47,7 @@ export class InstanceService {
                 break;
             case ToscaTypes.ServiceTemplate:
                 subMenu = ['README', 'LICENSE', 'Topology Template', 'Plans', 'Selfservice Portal',
-                    'Boundary Definitions', 'Tags', 'Documentation', 'XML', 'Constraint Checking'];
+                    'Boundary Definitions', 'Tags', 'Constraint Checking', 'Documentation', 'XML'];
                 break;
             case ToscaTypes.RelationshipType:
                 subMenu = ['README', 'LICENSE', 'Visual Appearance', 'Instance States', 'Source Interfaces', 'Target Interfaces',

diff --git a/....repository.ui/src/app/wineryMainModules/serviceTemplates/serviceTemplateRouter.module.ts b/....repository.ui/src/app/wineryMainModules/serviceTemplates/serviceTemplateRouter.module.ts
@@ -59,11 +59,11 @@ const serviceTemplateRoutes: Routes = [
                 // 'app/instance/serviceTemplates/boundaryDefinitions/boundaryDefinitions.module#BoundaryDefinitionsModule'
                 children: boundaryDefinitionsRoutes
             },
+            {path: 'constraintchecking', component: ConstraintCheckingComponent},
             {path: 'tags', component: TagComponent},
             {path: 'documentation', component: DocumentationComponent},
             {path: 'xml', component: EditXMLComponent},
-            {path: '', redirectTo: 'readme', pathMatch: 'full'},
-            {path: 'checking', component: ConstraintCheckingComponent}
+            {path: '', redirectTo: 'readme', pathMatch: 'full'}
         ]
     }
 ];