[ALIEN-1911] Display a list of conflicts in the dependency pane.

OresteVisari · Dec 15, 2016 · ec1e28c · ec1e28c
1 parent c4342ee
commit ec1e28c
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -41,6 +41,7 @@ alien4cloud.log
 /data/
 /target/
 /.idea/
+alien4cloud-ui/.idea/
 *.iml
 alien4cloud-rest-api/data/
 alien4cloud-security/.gitignore

diff --git a/alien4cloud-ui/src/main/webapp/data/languages/locale-en-us.json b/alien4cloud-ui/src/main/webapp/data/languages/locale-en-us.json
@@ -105,6 +105,13 @@
         "INCOMPATIBLE_VERSIONS": {
           "TITLE": "Dependency version conflict",
           "CONTENT": "The topology has already a dependency to the archive <{{archiveName}}> version <{{archiveVersion}}>. You can not use a component from the same archive with a different version. Please upgrade or downgrade the topology dependency if you want to use a different version."
+        },
+        "CONFLICTS" : {
+          "TITLE" : "Transitive dependency conflicts",
+          "SOURCE": "Source",
+          "DEPENDENCY": "Dependency",
+          "ACTUAL": "Actual version",
+          "MESSAGE": "Transitive dependency conflicts may cause incompatibility issues."
         }
       },
       "DESC_TEMPLATE" : "Topology template description",

diff --git a/alien4cloud-ui/src/main/webapp/data/languages/locale-fr-fr.json b/alien4cloud-ui/src/main/webapp/data/languages/locale-fr-fr.json
@@ -102,6 +102,13 @@
         "INCOMPATIBLE_VERSIONS": {
           "TITLE": "Conflit de version de dépendances",
           "CONTENT": "La topologie a déjà une dépendance vers l'archive <{{archiveName}}> version <{{archiveVersion}}>. Vous ne pouvez pas utiliser un composant provenant de cette même archive avec une version différente. Vous pouvez changer la version de la dépendance si vous souhaitez utiliser une version différente."
+        },
+        "CONFLICTS" : {
+          "TITLE" : "Conflits de dépendances transitives :",
+          "SOURCE": "Source",
+          "DEPENDENCY": "Dépendance",
+          "ACTUAL": "Version actuelle",
+          "MESSAGE": "Les conflits de dépendances transitives peuvent entrainer des incompatibilités."
         }
       },
       "DESC_TEMPLATE" : "Description du modèle",

diff --git a/alien4cloud-ui/src/main/webapp/views/topology/topology_editor.html b/alien4cloud-ui/src/main/webapp/views/topology/topology_editor.html
@@ -696,7 +696,27 @@ <h4>
               <td>{{dependency.version}}</td>
             </tr>
           </tbody>
-        </table>
+          </table>
+          <div ng-show="topology.dependencyConflicts">
+            <h5 style="margin-left: 10px;"><i class="fa fa-exclamation-triangle"></i>&nbsp;{{ 'APPLICATIONS.TOPOLOGY.DEPENDENCIES.CONFLICTS.TITLE' | translate }}</h5>
+            <table class="table table-hover">
+              <thead>
+              <tr>
+                <th>{{ 'APPLICATIONS.TOPOLOGY.DEPENDENCIES.CONFLICTS.SOURCE' | translate }}</th>
+                <th>{{ 'APPLICATIONS.TOPOLOGY.DEPENDENCIES.CONFLICTS.DEPENDENCY' | translate }}</th>
+                <th>{{ 'APPLICATIONS.TOPOLOGY.DEPENDENCIES.CONFLICTS.ACTUAL' | translate }}</th>
+              </tr>
+              </thead>
+              <tbody>
+                <tr ng-repeat="conflict in topology.dependencyConflicts | orderBy:'source'">
+                  <td>{{ conflict.source }}</td>
+                  <td>{{ conflict.expected }}</td>
+                  <td>{{ conflict.actualVersion }}</td>
+                </tr>
+              </tbody>
+            </table>
+            <div style="padding: 0 5px"><em>{{ 'APPLICATIONS.TOPOLOGY.DEPENDENCIES.CONFLICTS.MESSAGE' | translate }}</em></div>
+          </div>
         </div>
       </div>
     </div>
@@ -970,7 +990,7 @@ <h4>{{'APPLICATIONS.TOPOLOGY.SUBSTITUTIONS.REQUIREMENTS' | translate}}</h4>
         </li>
         <li ng-show="!displays.dependencies.active">
           <span id="topology-dependencies" ng-click="display.toggle('dependencies')">
-            <i class="fa fa-archive"></i> {{'APPLICATIONS.TOPOLOGY.DEPENDENCY' | translate}}
+            <i class="fa fa-archive"></i> {{'APPLICATIONS.TOPOLOGY.DEPENDENCY' | translate}} <i ng-show="topology.dependencyConflicts" class="fa fa-exclamation-triangle"></i>
           </span>
         </li>
         <li ng-show="!displays.inputs.active">