* fix #300 Améliorer l'affichage du modèles de propriétés sur la page…

… de module corrections après revue
sncf-connect-tech · Oct 11, 2019 · f8b5968 · f8b5968
1 parent 9063532
commit f8b5968
Show file tree

Hide file tree

Showing 7 changed files with 27 additions and 101 deletions.
diff --git a/src/app/i18n/label_en.json b/src/app/i18n/label_en.json
@@ -72,7 +72,9 @@
   "module.specificFiles": "Files attached to the module",
   "module.technoList": "Technos of this module",
   "module.platformList": "List of platform using this module",
-  "module.propertiesList": "Module properties list (model)",
+  "modules.propertiesList.tooltip": "Display or hide the list of module properties (model)",
+  "module.propertiesList.showButton": "Show properties",
+  "module.propertiesList.hideButton": "Hide properties",
   "module.propertiesList.headers.name": "Name",
   "module.propertiesList.headers.annotations": "Annotations",
   "module.search.techno": "Search for a techno",
@@ -109,9 +111,6 @@
   "template.rights.default": "Default right",
   "template.rights.applied": "Applied right",
   "template.rights.removed": "Removed right",
-  "model.modal.title": "Properties attached to the module {{name}}",
-  "model.modal.empty": "None property to display",
-  "model.modal.simpleProperties.title": "Simple properties :",
   "model.multipleProperties.title": "Multiple properties :",
   "platform.modal.title": "New platform",
   "platform.modal.applicationName": "Application name",

diff --git a/src/app/i18n/label_fr.json b/src/app/i18n/label_fr.json
@@ -72,7 +72,9 @@
   "module.specificFiles": "Les fichiers associés au module",
   "module.technoList": "Les technos de ce module",
   "module.platformList": "Liste des plateformes utilisant ce module",
-  "module.propertiesList": "Liste des propriétés valorisables du module (modèle)",
+  "modules.propertiesList.tooltip": "Afficher ou cacher la liste des propriétés du module (modèle)",
+  "module.propertiesList.showButton": "Afficher les propriétés",
+  "module.propertiesList.hideButton": "Cacher les propriétés",
   "module.propertiesList.headers.name": "Nom",
   "module.propertiesList.headers.annotations": "Annotations",
   "module.search.techno": "Rechercher une techno",
@@ -109,9 +111,6 @@
   "template.rights.default": "Droit par défaut",
   "template.rights.applied": "Droit positionné",
   "template.rights.removed": "Droit supprimé",
-  "model.modal.title": "Propriétés associées au module {{name}}",
-  "model.modal.empty": "Aucune propriété à afficher",
-  "model.modal.simpleProperties.title": "Propriétés simples :",
   "model.multipleProperties.title": "Propriétés multiples :",
   "platform.modal.title": "Nouvelle plateforme",
   "platform.modal.applicationName": "Nom de l'application",

diff --git a/src/app/model/model-modal.html b/src/app/model/model-modal.html
diff --git a/src/app/module/module.css b/src/app/module/module.css
@@ -9,6 +9,8 @@
 
 .module-row-for-properties {
     width: 100%;
+
+    overflow: auto; /* pour eviter que la div ne deborde du containeur parrent et dépasser la taille maximale fixée */
 }
 
 .module-properties-headers, .module-properties-row {
@@ -20,6 +22,7 @@
     border-bottom: 1px solid black;
 }
 
+
 .module-property-name {
     font-weight: bold;
     text-align: right;
@@ -33,4 +36,9 @@
 
 .module-property-annotation-name {
     font-weight: bold;
-}
+}
+
+.module-property-annotation-container {
+    overflow: auto;
+    margin-right: 10px;
+}
diff --git a/src/app/module/module.html b/src/app/module/module.html
@@ -29,9 +29,6 @@ <h3><span> Module <strong><u>{{module.name}}</u></strong>, Version <strong><u>{{
                            ng-show="is_workingcopy"
                            ng-click="open_create_release_dialog(module)">
                     <i class="fa fa-code-fork"></i> {{ 'button.release.create' | translate }}</md-button>
-                <md-button id="e2e-module-associated-properties-button" class="md-raised md-warn"
-                           ng-click="open_associated_properties_dialog(module)">
-                    <i class="fa fa-list"></i> {{ 'button.associateProperties' | translate }}</md-button>
             </h3>
         </div>
     </div>
@@ -71,9 +68,12 @@ <h4>{{ 'module.technoList' | translate }}</h4>
     </div>
 </div>
 <div layout="row">
-    <div class="bg-light module-row-for-properties">
-        <h4>{{ 'module.propertiesList' | translate }}</h4>
-        <div class="module-properties">
+    <div class="bg-light module-row-for-properties" >
+        <md-button class="md-raised md-primary" ng-model="collapsePropertiesList" ng-click="collapsePropertiesList =! collapsePropertiesList"> 
+            <md-tooltip>{{'modules.propertiesList.tooltip' | translate}}</md-tooltip>
+            <i class="fa fa-list"></i> {{ collapsePropertiesList ? 'module.propertiesList.hideButton' : 'module.propertiesList.showButton' | translate }}
+        </md-button>             
+        <div ng-show="collapsePropertiesList" class="module-properties">
             <div layout="row" class="module-properties-headers">
                 <div flex="30" class="module-property-name">{{ 'module.propertiesList.headers.name' | translate }}</div>
                 <div class="module-property-annotation module-property-annotation-name">{{ 'module.propertiesList.headers.annotations' | translate }}</div>
@@ -84,9 +84,9 @@ <h4>{{ 'module.propertiesList' | translate }}</h4>
                 <div flex layout="row" class="module-property-annotation">
                     <div flex="20" ng-if="property.required"><span class="module-property-annotation-name">@required</span></div>
                     <div flex="20" ng-if="property.password"><span class="module-property-annotation-name">@password</span></div>
-                    <div flex="20" ng-if="property.defaultValue"><span class="module-property-annotation-name">@default</span>&nbsp;{{ property.defaultValue }}</div>
-                    <div flex="20" ng-if="property.pattern"><span class="module-property-annotation-name">@pattern</span>&nbsp;{{ property.pattern }}</div>
-                    <div flex="20" ng-if="property.comment"><span class="module-property-annotation-name">@comment</span>&nbsp;{{ property.comment }}</div>
+                    <div flex="20" ng-if="property.defaultValue" class="module-property-annotation-container"><span class="module-property-annotation-name">@default</span>&nbsp;{{ property.defaultValue }}</div>
+                    <div flex="20" ng-if="property.pattern" class="module-property-annotation-container"><span class="module-property-annotation-name">@pattern</span>&nbsp;{{ property.pattern }}</div>
+                    <div flex="20" ng-if="property.comment" class="module-property-annotation-container"><span class="module-property-annotation-name">@comment</span>&nbsp;{{ property.comment }}</div>
                 </div>
             </div>
         </div>

diff --git a/src/app/module/module.js b/src/app/module/module.js
@@ -198,28 +198,6 @@ angular.module('hesperides.module', [ 'hesperides.application' ])
                 });
             };
 
-            /**
-             * Affiche la liste des propriétés associées à un module.
-             */
-            $scope.open_associated_properties_dialog = function (module) {
-                var modalScope = $scope.$new(true);
-
-                modalScope.$closeDialog = function () {
-                    $mdDialog.cancel();
-                };
-
-                modalScope.$save = function (release_version) {
-                    $scope.create_release(module, release_version);
-                    $mdDialog.cancel();
-                };
-
-                $mdDialog.show({
-                    templateUrl: 'model/model-modal.html',
-                    controller: 'ModuleController',
-                    clickOutsideToClose: true,
-                    scope: modalScope,
-                });
-            };
         },
     ])
 

diff --git a/test/e2e/modules/modules-spec.js b/test/e2e/modules/modules-spec.js
@@ -27,6 +27,9 @@ describe('Manage modules', () => {
         utils.deleteHttpRequest(`${ hesperides_url }/rest/modules/${ data.new_module_name }/${ data.new_module_version }/workingcopy`);
         utils.deleteHttpRequest(`${ hesperides_url }/rest/modules/${ data.new_module_name }/${ data.new_module_version }/release`);
         utils.deleteHttpRequest(`${ hesperides_url }/rest/modules/${ data.new_module_name }/${ data.new_module_version }_from/workingcopy`);
+        // We delete any platforms that could be using modules:
+        utils.deleteHttpRequest(`${ hesperides_url }/rest/applications/${ data.new_application }/platforms/${ data.new_platform }`);
+        utils.deleteHttpRequest(`${ hesperides_url }/rest/applications/${ data.new_application }/platforms/${ data.new_platform }_from`);
     });
 
     it('should create module in working copy', () => {