Sidebar for research plugins and instance model retrieval (winery#532)

Co-authored-by: Lukas Harzenetter <[email protected]>
OpenTOSCA · Feb 8, 2021 · ef5daec · ef5daec
1 parent 61d01e7
commit ef5daec
Show file tree

Hide file tree

Showing 103 changed files with 2,926 additions and 1,566 deletions.
diff --git a/.gitignore b/.gitignore
@@ -21,6 +21,9 @@ org.eclipse.winery.repository.ui/src/assets/build-code**
 # generated by CLi when executing with -cb copy.bara.sky
 copy.bara.sky
 
+# generated by sshd
+**/host.ser
+
 ## Eclipse
 **/.classpath
 **/.settings

diff --git a/org.eclipse.winery.accountability/pom.xml b/org.eclipse.winery.accountability/pom.xml
@@ -127,9 +127,9 @@
                 <version>${maven.surefire.version}</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>maven-surefire-common</artifactId>
-                        <version>${maven.surefire.version}</version>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit.jupiter.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/org.eclipse.winery.cli/pom.xml b/org.eclipse.winery.cli/pom.xml
@@ -107,9 +107,9 @@
                 <version>${maven.surefire.version}</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>maven-surefire-common</artifactId>
-                        <version>${maven.surefire.version}</version>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit.jupiter.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/org.eclipse.winery.common/pom.xml b/org.eclipse.winery.common/pom.xml
@@ -135,9 +135,9 @@
                 <version>${maven.surefire.version}</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>maven-surefire-common</artifactId>
-                        <version>${maven.surefire.version}</version>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit.jupiter.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/org.eclipse.winery.compliance/pom.xml b/org.eclipse.winery.compliance/pom.xml
@@ -91,9 +91,9 @@
                 <version>${maven.surefire.version}</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>maven-surefire-common</artifactId>
-                        <version>${maven.surefire.version}</version>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit.jupiter.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/org.eclipse.winery.crawler/pom.xml b/org.eclipse.winery.crawler/pom.xml
@@ -149,9 +149,9 @@
                 <version>${maven.surefire.version}</version>
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.maven.surefire</groupId>
-                        <artifactId>maven-surefire-common</artifactId>
-                        <version>${maven.surefire.version}</version>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit.jupiter.version}</version>
                     </dependency>
                 </dependencies>
             </plugin>

diff --git a/org.eclipse.winery.edmm/pom.xml b/org.eclipse.winery.edmm/pom.xml
@@ -103,6 +103,17 @@
                     </dependency>
                 </dependencies>
             </plugin>
+            <plugin>
+                <artifactId>maven-surefire-plugin</artifactId>
+                <version>${maven.surefire.version}</version>
+                <dependencies>
+                    <dependency>
+                        <groupId>org.junit.jupiter</groupId>
+                        <artifactId>junit-jupiter-engine</artifactId>
+                        <version>${junit.jupiter.version}</version>
+                    </dependency>
+                </dependencies>
+            </plugin>
         </plugins>
     </build>
 

diff --git a/org.eclipse.winery.edmm/src/test/java/org/eclipse/winery/edmm/model/EdmmConverterTest.java b/org.eclipse.winery.edmm/src/test/java/org/eclipse/winery/edmm/model/EdmmConverterTest.java
@@ -43,7 +43,7 @@ protected EdmmConverterTest() throws UnsupportedEncodingException {
     void transformOneNodeTemplate() {
         // region *** build the TopologyTemplate ***
         TTopologyTemplate.Builder topology = new TTopologyTemplate.Builder();
-        topology.addNodeTemplates(nodeTemplates.get("test_node_1"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_1"));
         // endregion
 
         TServiceTemplate serviceTemplate = new TServiceTemplate();
@@ -61,7 +61,7 @@ void transformOneNodeTemplate() {
     void transformDerivedFrom() {
         // region *** build the TopologyTemplate ***
         TTopologyTemplate.Builder topology = new TTopologyTemplate.Builder();
-        topology.addNodeTemplates(nodeTemplates.get("test_node_2"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_2"));
         // endregion
 
         TServiceTemplate serviceTemplate = new TServiceTemplate();
@@ -83,7 +83,7 @@ void transformDerivedFrom() {
     void transformProperties() {
         // region *** build the TopologyTemplate ***
         TTopologyTemplate.Builder topology = new TTopologyTemplate.Builder();
-        topology.addNodeTemplates(nodeTemplates.get("test_node_3"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_3"));
         // endregion
 
         TServiceTemplate serviceTemplate = new TServiceTemplate();
@@ -123,9 +123,9 @@ void transformProperties() {
     void transformTopologyWithRelationsAndRelationTypes() {
         // region *** build the TopologyTemplate ***
         TTopologyTemplate.Builder topology = new TTopologyTemplate.Builder();
-        topology.addNodeTemplates(nodeTemplates.get("test_node_1"));
-        topology.addNodeTemplates(nodeTemplates.get("test_node_2"));
-        topology.addNodeTemplates(nodeTemplates.get("test_node_3"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_1"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_2"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_3"));
         topology.addRelationshipTemplate(relationshipTemplates.get("1_hosted_on_3"));
         topology.addRelationshipTemplate(relationshipTemplates.get("2_hosted_on_3"));
         topology.addRelationshipTemplate(relationshipTemplates.get("1_connects_to_2"));
@@ -160,7 +160,7 @@ void transformTopologyWithRelationsAndRelationTypes() {
     void transformTopologyWithOperations() {
         // region *** build the TopologyTemplate ***
         TTopologyTemplate.Builder topology = new TTopologyTemplate.Builder();
-        topology.addNodeTemplates(nodeTemplates.get("test_node_4"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_4"));
         // endregion
 
         TServiceTemplate serviceTemplate = new TServiceTemplate();
@@ -189,10 +189,10 @@ void transformTopologyWithOperations() {
     void transformTopology() {
         // region *** build the TopologyTemplate ***
         TTopologyTemplate.Builder topology = new TTopologyTemplate.Builder();
-        topology.addNodeTemplates(nodeTemplates.get("test_node_1"));
-        topology.addNodeTemplates(nodeTemplates.get("test_node_2"));
-        topology.addNodeTemplates(nodeTemplates.get("test_node_3"));
-        topology.addNodeTemplates(nodeTemplates.get("test_node_4"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_1"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_2"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_3"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_4"));
         topology.addRelationshipTemplate(relationshipTemplates.get("1_hosted_on_3"));
         topology.addRelationshipTemplate(relationshipTemplates.get("2_hosted_on_3"));
         topology.addRelationshipTemplate(relationshipTemplates.get("4_hosted_on_1"));
@@ -212,8 +212,8 @@ void transformTopology() {
             "  test_node_1:\n" +
             "    type: software_component\n" +
             "    relations:\n" +
-            "    - hosted_on: test_node_3\n" +
             "    - connects_to: test_node_2\n" +
+            "    - hosted_on: test_node_3\n" +
             "    artifacts:\n" +
             "    - war: /artifacttemplates/https%3A%2F%2Fex.org%2Ftosca%2Fto%2Fedmm/startTestNode4/files/script.sh\n" +
             "  test_node_3:\n" +
@@ -223,9 +223,9 @@ void transformTopology() {
             "      ssh_port: '22'\n" +
             "      os_family: ubuntu\n" +
             "  test_node_2:\n" +
-            "    type: https_ex.orgtoscatoedmm__test_node_type_2\n" +
             "    relations:\n" +
             "    - hosted_on: test_node_3\n" +
+            "    type: https_ex.orgtoscatoedmm__test_node_type_2\n" +
             "  test_node_4:\n" +
             "    operations:\n" +
             "      stop: /artifacttemplates/https%3A%2F%2Fex.org%2Ftosca%2Fto%2Fedmm/startTestNode4/files/script.sh\n" +

diff --git a/...e.winery.edmm/src/test/java/org/eclipse/winery/edmm/toscalight/ToscaLightCheckerTest.java b/...e.winery.edmm/src/test/java/org/eclipse/winery/edmm/toscalight/ToscaLightCheckerTest.java
@@ -38,10 +38,10 @@ protected ToscaLightCheckerTest() throws UnsupportedEncodingException {
     void checkValidServiceTemplate() throws Exception {
         // region *** build the TopologyTemplate ***
         TTopologyTemplate.Builder topology = new TTopologyTemplate.Builder();
-        topology.addNodeTemplates(nodeTemplates.get("test_node_1"));
-        topology.addNodeTemplates(nodeTemplates.get("test_node_2"));
-        topology.addNodeTemplates(nodeTemplates.get("test_node_3"));
-        topology.addNodeTemplates(nodeTemplates.get("test_node_4"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_1"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_2"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_3"));
+        topology.addNodeTemplate(nodeTemplates.get("test_node_4"));
         topology.addRelationshipTemplate(relationshipTemplates.get("1_hosted_on_3"));
         topology.addRelationshipTemplate(relationshipTemplates.get("2_hosted_on_3"));
         topology.addRelationshipTemplate(relationshipTemplates.get("4_hosted_on_1"));

diff --git a/org.eclipse.winery.edmm/src/test/resources/logback-test.xml b/org.eclipse.winery.edmm/src/test/resources/logback-test.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+  ~ Copyright (c) 2017-2018 Contributors to the Eclipse Foundation
+  ~
+  ~ See the NOTICE file(s) distributed with this work for additional
+  ~ information regarding copyright ownership.
+  ~
+  ~ This program and the accompanying materials are made available under the
+  ~ terms of the Eclipse Public License 2.0 which is available at
+  ~ http://www.eclipse.org/legal/epl-2.0, or the Apache Software License 2.0
+  ~ which is available at https://www.apache.org/licenses/LICENSE-2.0.
+  ~
+  ~ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
+  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<configuration>
+
+    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
+        <filter class="ch.qos.logback.classic.filter.ThresholdFilter">
+            <level>INFO</level>
+        </filter>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36}:%line %method - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <appender name="FILE" class="ch.qos.logback.core.FileAppender">
+        <file>${user.home}/winery-debug.log</file>
+        <encoder>
+            <pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36}:%line %method - %msg%n</pattern>
+        </encoder>
+    </appender>
+
+    <logger name="org.eclipse.winery" level="TRACE"/>
+    <logger name="org.eclipse.winery.repository.export.ToscaExportUtil" level="TRACE"/>
+    <logger name="org.eclipse.winery.repository.export.CsarExporter" level="TRACE"/>
+    <logger name="org.eclipse.winery.repository.backend.filebased.GitBasedRepository" level="TRACE"/>
+    <logger name="org.eclipse.winery.repository.importing.CsarImporter" level="TRACE"/>
+    <logger name="org.eclipse.winery.repository.JAXBSupport" level="DEBUG"/>
+    <logger name="org.eclipse.winery.repository.Utils" level="TRACE"/>
+
+    <logger name="com.sun.jersey" level="WARN"/>
+    <logger name="org.apache.catalina.core.ApplicationDispatcher" level="SEVERE"/>
+    <logger name="org.apache.http" level="WARN"/>
+    <logger name="org.eclipse.jetty" level="WARN"/>
+    <logger name="org.eclipse.jgit" level="WARN"/>
+
+    <root level="TRACE">
+        <appender-ref ref="STDOUT"/>
+        <appender-ref ref="FILE"/>
+    </root>
+</configuration>
diff --git a/org.eclipse.winery.frontends/app/topologymodeler/src/app/canvas/canvas.component.ts b/org.eclipse.winery.frontends/app/topologymodeler/src/app/canvas/canvas.component.ts
@@ -12,7 +12,8 @@
  * SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
  ********************************************************************************/
 import {
-    AfterViewInit, Component, ElementRef, HostListener, Input, KeyValueDiffers, NgZone, OnChanges, OnDestroy, OnInit, QueryList, Renderer2, SimpleChanges,
+    AfterViewInit, Component, ElementRef, HostListener, Input, KeyValueDiffers, NgZone, OnChanges, OnDestroy, OnInit,
+    QueryList, Renderer2, SimpleChanges,
     ViewChild, ViewChildren
 } from '@angular/core';
 import { JsPlumbService } from '../services/jsPlumb.service';
@@ -60,6 +61,7 @@ import { WineryRowData } from '../../../../tosca-management/src/app/wineryTableM
 import { InheritanceUtils } from '../models/InheritanceUtils';
 import { PolicyService } from '../services/policy.service';
 import { QName } from '../../../../shared/src/app/model/qName';
+import { DetailsSidebarState } from '../sidebars/node-details/node-details-sidebar';
 
 @Component({
     selector: 'winery-canvas',
@@ -1540,21 +1542,8 @@ export class CanvasComponent implements OnInit, OnDestroy, OnChanges, AfterViewI
      * Hides the Sidebar on the right.
      */
     hideSidebar() {
-        this.ngRedux.dispatch(this.actions.openSidebar({
-            sidebarContents: {
-                visible: false,
-                nodeClicked: false,
-                template: {
-                    id: '',
-                    name: '',
-                    type: '',
-                    properties: '',
-                },
-                relationshipTemplate: undefined,
-                source: '',
-                target: '',
-            }
-        }));
+        this.ngRedux.dispatch(this.actions.triggerSidebar(
+            { sidebarContents: new DetailsSidebarState(false) }));
     }
 
     /**
@@ -1981,7 +1970,7 @@ export class CanvasComponent implements OnInit, OnDestroy, OnChanges, AfterViewI
                 // Workaround to support old topology templates with the real name
                 name = currentRel.type.substring(currentRel.type.indexOf('}') + 1);
             }
-            this.ngRedux.dispatch(this.actions.openSidebar({
+            this.ngRedux.dispatch(this.actions.triggerSidebar({
                 sidebarContents: {
                     visible: true,
                     nodeClicked: false,

diff --git a/...app/topologymodeler/src/app/edmmTransformationCheck/edmmTransformationCheck.component.css b/...app/topologymodeler/src/app/edmmTransformationCheck/edmmTransformationCheck.component.css
@@ -24,7 +24,7 @@
     background-color: #d43f3a;
 }
 
-.cursorpointer{
+.cursorPointer {
     cursor: pointer;
 }
 

diff --git a/...pp/topologymodeler/src/app/edmmTransformationCheck/edmmTransformationCheck.component.html b/...pp/topologymodeler/src/app/edmmTransformationCheck/edmmTransformationCheck.component.html
@@ -11,32 +11,33 @@
   ~
   ~ SPDX-License-Identifier: EPL-2.0 OR Apache-2.0
   ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<div id="RefinementView"  *ngIf="isVisible">
-    <div class="refinementContainer">
-        <div class="loader" *ngIf="loading; else showResult"></div>
-        <ng-template #showResult>
-            <winery-edmm-replacement-rules *ngFor="let candidate of checkResult"
-                                           [pluginResult]="candidate"
-                                           [currentCandidate] = "currentCandidate"
-                                           [topologyTemplate]="topologyTemplate"
-                                           [oneToOneMap]="oneToOneMap">
-            </winery-edmm-replacement-rules>
-            <div class="sidebar-root">
-                <ul>
-                    <li *ngFor="let candidate of checkResult"
-                        [id]="candidate.id" [ngClass]="getColorClass(candidate)">
-                        <div>
-                            <span>{{ candidate.name }} supports: {{ (candidate.supports * 100) | number : '1.1-2'  }}%</span><br>
-                            <button *ngIf="candidate.replacementRules.length > 0" (click)="showReplacementRules(candidate)" class="dark-button-style" >
-                                show replacements
-                            </button>
-                            <button *ngIf="isApplicable(candidate)" (click)="doTransformation(candidate)" class="dark-button-style">
-                                do transformation
-                            </button>
-                        </div>
-                    </li>
-                </ul>
-            </div>
-        </ng-template>
+
+<div class="loader" *ngIf="loading; else showResult"></div>
+<ng-template #showResult>
+    <winery-edmm-replacement-rules *ngFor="let candidate of checkResult"
+                                   [pluginResult]="candidate"
+                                   [currentCandidate]="currentCandidate"
+                                   [topologyTemplate]="topologyTemplate"
+                                   [oneToOneMap]="oneToOneMap">
+    </winery-edmm-replacement-rules>
+    <div>
+        <ul>
+            <li *ngFor="let candidate of checkResult"
+                [id]="candidate.id" [ngClass]="getColorClass(candidate)">
+                <div>
+                    <span>{{ candidate.name }} supports: {{ (candidate.supports * 100) | number : '1.1-2'  }}
+                        %</span><br>
+                    <button *ngIf="candidate.replacementRules.length > 0" (click)="showReplacementRules(candidate)"
+                            class="dark-button-style">
+                        show replacements
+                    </button>
+                    <button *ngIf="isApplicable(candidate)" (click)="doTransformation(candidate)"
+                            class="dark-button-style">
+                        do transformation
+                    </button>
+                </div>
+            </li>
+        </ul>
     </div>
-</div>
+</ng-template>
+