Merge 34df074 into a75d9d6

theforeman · Jan 22, 2024 · a248d4b · a248d4b
2 parents a75d9d6 + 34df074
commit a248d4b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/webpack/assets/javascripts/react_app/components/Layout/LayoutHelper.js b/webpack/assets/javascripts/react_app/components/Layout/LayoutHelper.js
@@ -41,7 +41,7 @@ export const combineMenuItems = (data, displayNewHostsPage) => {
 
     const translatedItem = {
       ...item,
-      name: __(item.name),
+      name: item.name === 'User' ? data.user.current_user.name : __(item.name),
       children: translatedChildren,
       // Hiding user if not on Mobile view
       className: item.name === 'User' ? 'hidden-nav-lg' : '',

diff --git a/webpack/assets/javascripts/react_app/components/Layout/Navigation.js b/webpack/assets/javascripts/react_app/components/Layout/Navigation.js
@@ -1,6 +1,7 @@
 import React, { useState, useEffect, useMemo } from 'react';
 import PropTypes from 'prop-types';
 import classNames from 'classnames';
+import EllipsisWithTooltip from 'react-ellipsis-with-tooltip';
 import {
   Nav,
   NavList,
@@ -16,10 +17,10 @@ import {
 } from '../../Root/Context/ForemanContext';
 
 const titleWithIcon = (title, iconClass) => (
-  <div>
+  <EllipsisWithTooltip>
     <span className={classNames(iconClass, 'nav-title-icon')} />
     <span className="nav-title">{title}</span>
-  </div>
+  </EllipsisWithTooltip>
 );
 
 const Navigation = ({