From 6173f6e9ca80be6148f6c29f6e8af59b11ca3100 Mon Sep 17 00:00:00 2001
From: Romain Bioteau <romain.bioteau@bonitasoft.com>
Date: Thu, 28 Mar 2019 16:12:11 +0100
Subject: [PATCH] fix(editor) allow empty displayName (#2663)

* Use technical name as fallback if displayName is null or empty

Closes UID-30
---
 .../export/properties/PagePropertiesBuilder.java      |  3 ++-
 .../org/bonitasoft/web/designer/model/page/Page.java  |  4 ++--
 frontend/app/js/editor/header/metadata-popup.html     | 11 ++++-------
 frontend/test/e2e/spec/editor-menu.spec.js            |  4 ++--
 4 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/backend/webapp/src/main/java/org/bonitasoft/web/designer/controller/export/properties/PagePropertiesBuilder.java b/backend/webapp/src/main/java/org/bonitasoft/web/designer/controller/export/properties/PagePropertiesBuilder.java
index 7a4d90480..27d10f474 100644
--- a/backend/webapp/src/main/java/org/bonitasoft/web/designer/controller/export/properties/PagePropertiesBuilder.java
+++ b/backend/webapp/src/main/java/org/bonitasoft/web/designer/controller/export/properties/PagePropertiesBuilder.java
@@ -14,6 +14,7 @@
  */
 package org.bonitasoft.web.designer.controller.export.properties;
 
+import org.apache.commons.lang3.StringUtils;
 import org.bonitasoft.web.designer.controller.PageResource;
 import org.bonitasoft.web.designer.model.page.Page;
 import org.bonitasoft.web.designer.rendering.GenerationException;
@@ -42,7 +43,7 @@ public byte[] build(Page page) throws GenerationException, IOException {
         Properties properties = new Properties();
         properties.put("name", "custompage_" + page.getName());
         properties.put("contentType", String.valueOf(page.getType()).toLowerCase(Locale.ENGLISH));
-        properties.put("displayName", page.getDisplayName());
+        properties.put("displayName", StringUtils.isBlank(page.getDisplayName())? page.getName() : page.getDisplayName());
         properties.put("description", page.getDescription());
         properties.put("resources", resources.toString());
         ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
diff --git a/backend/webapp/src/main/java/org/bonitasoft/web/designer/model/page/Page.java b/backend/webapp/src/main/java/org/bonitasoft/web/designer/model/page/Page.java
index c17766db8..e1bf15fad 100644
--- a/backend/webapp/src/main/java/org/bonitasoft/web/designer/model/page/Page.java
+++ b/backend/webapp/src/main/java/org/bonitasoft/web/designer/model/page/Page.java
@@ -25,7 +25,7 @@ public class Page extends AbstractPage implements HasUUID {
     private String uuid;
     private String type = "page";
     private String description = "Page generated with Bonita UI designer";
-    private String displayName = "";
+    private String displayName;
 
     @JsonView({JsonViewLight.class, JsonViewPersistence.class})
     public String getType() {
@@ -57,7 +57,7 @@ public void setDescription(String description) {
 
     @JsonView({JsonViewPersistence.class})
     public String getDisplayName() {
-        return "".equals(displayName) ? this.getName() : displayName;
+        return displayName;
     }
 
     public void setDisplayName(String displayName) {
diff --git a/frontend/app/js/editor/header/metadata-popup.html b/frontend/app/js/editor/header/metadata-popup.html
index 149268565..47c9709be 100644
--- a/frontend/app/js/editor/header/metadata-popup.html
+++ b/frontend/app/js/editor/header/metadata-popup.html
@@ -4,19 +4,16 @@ <h3 class="modal-title" translate>{{ctrl.page.name}} information</h3>
 <form class="form EditorHeader-editMetadata" name="editMetadata" novalidate>
     <div class="modal-body" id="modal-edit-metadata">
         <h4 translate>Metadata</h4>
-        <div class="form-group" ng-class="{'has-error': editMetadata.displayName.$invalid && editMetadata.displayName.$error.required}">
-            <label class="control-label control-label--required" for="page-displayName" translate>Display name</label>
-            <i class="fa fa-info-circle" uib-tooltip="{{'Used in the portal list of Resources. Part of the page.properties descriptor in the exported page archive.' | translate}}" tooltip-placement="right"></i>
+        <div class="form-group">
+            <label class="control-label" for="page-displayName" translate>Display name</label>
+            <i class="fa fa-info-circle" uib-tooltip="{{'Used in the portal list of Resources. Part of the page.properties descriptor in the exported page archive. If empty, page technical name is used as fallback.' | translate}}" tooltip-placement="right"></i>
             <input
                 name="displayName"
                 ng-model="ctrl.displayName"
                 class="form-control"
                 id="page-displayName"
                 placeholder="{{ 'Page display name' | translate }}"
-                maxlength="255"
-                required/>
-            <span class="help-block" ng-show="editMetadata.displayName.$invalid
-            && editMetadata.displayName.$error.required" translate>Display name is required.</span>
+                maxlength="255"/>
         </div>
         <div class="form-group">
             <label for="page-description" translate>Description</label>
diff --git a/frontend/test/e2e/spec/editor-menu.spec.js b/frontend/test/e2e/spec/editor-menu.spec.js
index f4e097c69..0ee7b052c 100644
--- a/frontend/test/e2e/spec/editor-menu.spec.js
+++ b/frontend/test/e2e/spec/editor-menu.spec.js
@@ -133,9 +133,9 @@ describe('editor menu', function() {
     var submitButton = $('.modal-footer .btn-primary');
 
 
-    // button disabled when we enter a wrong display name
+    // button enable when no display name
     displayName.clear();
-    expect(submitButton.isEnabled()).toBeFalsy();
+    expect(submitButton.isEnabled()).toBeTruthy();
 
     // display name and description are changed
     displayName.clear();