AMBARI-15824. Too long username breaks markup (onechiporenko)

ambari-web/app/models/configs/service_config_version.js

@@ -53,7 +53,7 @@ App.ServiceConfigVersion = DS.Model.extend({
   /**
    * @type {string}
    */
-  authorFormatted: Em.computed.truncate('author', 20, 20),
+  authorFormatted: Em.computed.truncate('author', 15, 15),
 
   /**
    * @type {string}

ambari-web/app/router.js

@@ -147,6 +147,8 @@ App.Router = Em.Router.extend({
     return this.getLoginName();
   }.property('loggedIn'),
 
+  displayLoginName: Em.computed.truncate('loginName', 10, 10),
+
   getAuthenticated: function () {
     var dfd = $.Deferred();
     var self = this;

ambari-web/app/templates/application.hbs

@@ -57,7 +57,7 @@
           {{#if App.router.loggedIn}}
             <div class="top-nav-user btn-group">
               <button class="btn dropdown-toggle" data-toggle="dropdown">
-                <i class="icon-user"></i>&nbsp;{{App.router.loginName}}&nbsp;<span class="caret"></span>
+                <i class="icon-user"></i>&nbsp;{{App.router.displayLoginName}}&nbsp;<span class="caret"></span>
               </button>
               <ul class="dropdown-menu">
                 <li><a href="" id="about" {{action showAboutPopup target="controller"}}>{{t app.aboutAmbari}}</a></li>

ambari-web/app/templates/common/configs/config_history_flow.hbs

@@ -44,7 +44,7 @@
                 {{#if view.compareServiceVersion.isCurrent}}
                     <span class="label label-success">{{t common.current}}</span>
                 {{/if}}
-                  <strong>{{view.compareServiceVersion.author}}</strong>&nbsp;{{t dashboard.configHistory.info-bar.authoredOn}}
+                  <strong>{{view.compareServiceVersion.authorFormatted}}</strong>&nbsp;{{t dashboard.configHistory.info-bar.authoredOn}}
                   &nbsp;<strong>{{view.compareServiceVersion.createdDate}}</strong>
               </div>
               <div class="pull-right operations-button">
@@ -66,7 +66,7 @@
                     <div class="row-fluid version-in-dropdown " {{action doAction serviceVersion view.actionTypes.SWITCH target="view"}}>
                       <div class="span2">{{serviceVersion.versionText}}</div>
                       <div class="span6">{{serviceVersion.createdDate}}</div>
-                      <div class="span3">{{serviceVersion.author}}</div>
+                      <div class="span3">{{serviceVersion.authorFormatted}}</div>
                       <div class="pull-right"><i class="icon-caret-right"></i></div>
                     </div>
                     <ul class="dropdown-menu version-info-operations">
@@ -74,7 +74,7 @@
                         <span class="label label-info">{{serviceVersion.versionText}}</span>
                         <span class="stack">{{serviceVersion.stackVersion}}</span>
                         <div class="group"><strong>{{serviceVersion.configGroupName}}</strong></div>
-                        <div class="date"><strong>{{serviceVersion.author}}</strong>&nbsp;{{t dashboard.configHistory.info-bar.authoredOn}}&nbsp;<strong>{{serviceVersion.createdDate}}</strong></div>
+                        <div class="date"><strong>{{serviceVersion.authorFormatted}}</strong>&nbsp;{{t dashboard.configHistory.info-bar.authoredOn}}&nbsp;<strong>{{serviceVersion.createdDate}}</strong></div>
                         <div class="notes">{{serviceVersion.fullNotes}}</div>
                       </div>
                       <div class="version-operations-buttons">
@@ -105,7 +105,7 @@
                   <span class="label-current label label-success icon-ok" data-toggle="tooltip" {{translateAttr title="common.current"}}></span>
               {{/if}}
               {{#if view.displayedServiceVersion.author}}
-                <strong>{{view.displayedServiceVersion.author}}</strong>&nbsp;{{t dashboard.configHistory.info-bar.authoredOn}}&nbsp;<strong>{{view.displayedServiceVersion.createdDate}}</strong>
+                <strong>{{view.displayedServiceVersion.authorFormatted}}</strong>&nbsp;{{t dashboard.configHistory.info-bar.authoredOn}}&nbsp;<strong>{{view.displayedServiceVersion.createdDate}}</strong>
               {{/if}}
             </div>
           {{#isAuthorized "SERVICE.MODIFY_CONFIGS"}}

ambari-web/app/templates/common/configs/service_version_box.hbs

@@ -22,7 +22,7 @@
     <div {{bindAttr class=":version-info :box :pull-right view.serviceVersion.isDisplayed:displayed view.serviceVersion.isDisabled:grayedOut"}} {{action doAction view.serviceVersion view.actionTypes.SWITCH target="view.parentView"}}>
       <div class="top-label">
         <span class="label label-info">{{view.serviceVersion.versionText}}</span>
-        <span class="author pull-right">{{view.serviceVersion.author}}</span>
+        <span class="author pull-right">{{view.serviceVersion.authorFormatted}}</span>
       </div>
       <div class="content">{{view.serviceVersion.timeSinceCreated}}</div>
       <div class="stack-label">{{view.serviceVersion.stackVersion}}</div>
@@ -39,7 +39,7 @@
       <div class="content">
         <span class="label label-info">{{view.serviceVersion.versionText}}</span> <span class="pull-right"><strong>{{view.serviceVersion.configGroupName}}</strong></span>
         <span class="stack">{{view.serviceVersion.stackVersion}}</span>
-        <div class="date"><strong>{{view.serviceVersion.author}}</strong>&nbsp;{{t dashboard.configHistory.info-bar.authoredOn}}&nbsp;<strong>{{view.serviceVersion.createdDate}}</strong></div>
+        <div class="date"><strong>{{view.serviceVersion.authorFormatted}}</strong>&nbsp;{{t dashboard.configHistory.info-bar.authoredOn}}&nbsp;<strong>{{view.serviceVersion.createdDate}}</strong></div>
         <div class="notes">{{view.serviceVersion.fullNotes}}</div>
       </div>
       <div class="version-operations-buttons">

ambari-web/app/templates/main/host/host_alerts.hbs

@@ -51,8 +51,8 @@
             <td>
               <a href="#" {{action routeToAlertDefinition instance.definitionId target="controller"}}>{{instance.label}}</a>
             </td>
-            <td>{{template "templates/main/alerts/alert_instance/status"}}
-              <time class="timeago" {{bindAttr data-original-title="instance.statusChangedAndLastCheckedFormatted"}}>{{instance.lastTriggeredForFormatted}}</time>
+            <td>
+              {{template "templates/main/alerts/alert_instance/status"}}
             </td>
             <td><span
                     class="alert-text" {{bindAttr data-original-title="instance.escapeSpecialCharactersFromTooltip"}}

ambari-web/app/views/common/configs/config_history_flow.js

@@ -182,7 +182,8 @@ App.ConfigHistoryFlowView = Em.View.extend({
       Em.get(this.get('serviceVersionsReferences'), key).destroy();
     }, this);
     this.$('.version-info-bar-wrapper').trigger('sticky_kit:detach').off();
-    this.$('[data-toggle=tooltip], [data-toggle=arrow-tooltip]').remove();
+    this.$('[data-toggle=tooltip]').tooltip('destroy');
+    this.$('[data-toggle=arrow-tooltip]').tooltip('destroy');
   },
 
   willInsertElement: function () {
@@ -521,6 +522,11 @@ App.ConfigHistoryFlowView = Em.View.extend({
 
 App.ConfigsServiceVersionBoxView = Em.View.extend({
 
+  /**
+   * bound from template
+   */
+  serviceVersion: null,
+
   actionTypesBinding: 'parentView.actionTypes',
 
   disabledActionAttr: Em.computed.alias('serviceVersion.disabledActionAttr'),
@@ -548,6 +554,7 @@ App.ConfigsServiceVersionBoxView = Em.View.extend({
 
   willDestroyElement: function() {
     this.$('.version-box').off();
-    this.$('[data-toggle=tooltip], [data-toggle=arrow-tooltip]').remove();
+    this.$('[data-toggle=tooltip]').tooltip('destroy');
+    this.$('[data-toggle=arrow-tooltip]').tooltip('destroy');
   }
 });

ambari-web/test/models/configs/service_config_version_test.js

@@ -33,7 +33,7 @@ describe('App.ServiceConfigVersion', function () {
 
   App.TestAliases.testAsComputedAnd(getModel(), 'canBeMadeCurrent', ['isCompatible', '!isCurrent']);
 
-  App.TestAliases.testAsComputedTruncate(getModel(), 'authorFormatted', 'author', 20, 20);
+  App.TestAliases.testAsComputedTruncate(getModel(), 'authorFormatted', 'author', 15, 15);
 
   App.TestAliases.testAsComputedTruncate(getModel(), 'briefNotes', 'fullNotes', 81, 81, '');