diff --git a/app/helpers/application_helper/navbar.rb b/app/helpers/application_helper/navbar.rb
index 08892192732..b99e9daf4fb 100644
--- a/app/helpers/application_helper/navbar.rb
+++ b/app/helpers/application_helper/navbar.rb
@@ -11,7 +11,7 @@ def item_to_hash(item)
:id => item.id.to_s,
:title => item.name,
:icon => item.icon,
- :href => item.link_params[:href],
+ :href => item.href,
:type => item.type,
:visible => item.visible?,
:active => item_active?(item),
diff --git a/app/javascript/components/main-menu/helpers.js b/app/javascript/components/main-menu/helpers.js
deleted file mode 100644
index 8aae44f65ef..00000000000
--- a/app/javascript/components/main-menu/helpers.js
+++ /dev/null
@@ -1,38 +0,0 @@
-export const getHrefByType = (type, href, id) => {
- switch (type) {
- case 'big_iframe':
- return `/dashboard/iframe?id=${id}`;
- case 'modal':
- return undefined;
- default:
- return href;
- }
-};
-
-export const getItemId = id => `menu_item_${id}`;
-
-export const getSectionId = id => `menu_section_${id}`;
-
-export const getIdByCategory = (isSection, id) => (isSection ? getSectionId(id) : getItemId(id));
-
-export const handleUnsavedChanges = (type) => {
- if (type === 'modal') {
- return sendDataWithRx({ type: 'showAboutModal' });
- }
- return window.miqCheckForChanges();
-};
-
-export const saveVerticalMenuState = (isVerticalMenuCollapsed) => {
- window.localStorage.setItem('patternfly-navigation-primary', isVerticalMenuCollapsed ? 'collapsed' : 'expanded');
-};
-
-export const adaptContentWidth = (isVerticalMenuCollapsed) => {
- const content = window.document.getElementsByClassName('container-pf-nav-pf-vertical-with-sub-menus')[0];
- if (content) {
- if (isVerticalMenuCollapsed) {
- content.classList.add('collapsed-nav');
- } else {
- content.classList.remove('collapsed-nav');
- }
- }
-};
diff --git a/app/javascript/components/main-menu/main-menu.jsx b/app/javascript/components/main-menu/main-menu.jsx
index 7d1afd3430a..c765e592bc4 100644
--- a/app/javascript/components/main-menu/main-menu.jsx
+++ b/app/javascript/components/main-menu/main-menu.jsx
@@ -8,7 +8,6 @@ import TopLevel from './top-level';
import SecondLevel from './second-level';
import ThirdLevel from './third-level';
import { menuProps, RecursiveMenuProps } from './recursive-props';
-import { adaptContentWidth } from './helpers';
const Fallback = props => ;
@@ -26,7 +25,16 @@ const MainMenu = ({ menu }) => {
const isVerticalMenuCollapsed = useSelector(({ menuReducer: { isVerticalMenuCollapsed } }) => isVerticalMenuCollapsed);
useEffect(() => {
- adaptContentWidth(isVerticalMenuCollapsed);
+ const content = document.querySelector('.container-pf-nav-pf-vertical-with-sub-menus');
+ if (! content) {
+ return;
+ }
+
+ if (isVerticalMenuCollapsed) {
+ content.classList.add('collapsed-nav');
+ } else {
+ content.classList.remove('collapsed-nav');
+ }
}, [isVerticalMenuCollapsed]);
const handleSetActiveIds = (value) => {
diff --git a/app/javascript/components/main-menu/second-level.jsx b/app/javascript/components/main-menu/second-level.jsx
index d2c51759231..fa49533dfe7 100644
--- a/app/javascript/components/main-menu/second-level.jsx
+++ b/app/javascript/components/main-menu/second-level.jsx
@@ -3,10 +3,7 @@ import PropTypes from 'prop-types';
import ClassNames from 'classnames';
import { MenuItem, HoverContext } from './main-menu';
import { menuProps } from './recursive-props';
-import {
- getHrefByType, getIdByCategory, handleUnsavedChanges,
-} from './helpers';
-import getTargetByType from '../../helpers/get-target-by-type';
+import { itemId, linkProps } from '../../menu/item-type';
const SecondLevel = ({
id,
@@ -31,20 +28,11 @@ const SecondLevel = ({
active,
},
)}
- id={getIdByCategory(hasSubitems, id)}
+ id={itemId(id, hasSubitems)}
onMouseEnter={() => (handleSetActiveIds(hasSubitems ? { secondLevelId: id } : undefined))}
onMouseLeave={() => handleSetActiveIds({ secondLevelId: undefined })}
>
- {
- if (handleUnsavedChanges(type) === false) {
- event.preventDefault();
- }
- return false;
- }}
- target={getTargetByType(type)}
- >
+
{title}