@blaze-cms/plugin-admin-core-ui 0.146.0-translations.6 → 0.147.0-rc-eagle.2

package/src/components/Layout/Layout.js

@@ -2,18 +2,20 @@ import React, { useState } from 'react';
 import PropTypes from 'prop-types';
 import { Query } from '@apollo/client/react/components';
 import { getQuery } from '@blaze-cms/admin-ui-utils';
-import { Login } from '@blaze-cms/plugin-auth-ui';
+import { Login, LoginModal } from '@blaze-cms/plugin-auth-ui';
+import { BlazeAuthContextWrapper } from '@blaze-cms/core-auth-ui';
+import '@blaze-cms/admin-ui-styles/main.scss';
 import { Grid } from './components';
 import Background from './Background';
-import '@blaze-cms/admin-ui-styles/main.scss';
+
 import Header from '../Header';
 
 const Layout = ({ children }) => {
   const [isOpenMenu, setOpenMenu] = useState(true);
+
   const onMenuClick = () => setOpenMenu(!isOpenMenu);
 
   const simpleLayout = window.location !== window.parent.location;
-
   const wrapperClass = simpleLayout ? ' grid--site-container--simle-layout' : '';
 
   return (
@@ -28,7 +30,8 @@ const Layout = ({ children }) => {
                 <Header isLoggedIn={isLoggedIn} onMenuClick={onMenuClick} isOpenMenu={isOpenMenu} />
               )}
               {isLoggedIn ? (
-                <>
+                <BlazeAuthContextWrapper>
+                  {!simpleLayout && <LoginModal />}
                   <Grid
                     isOpenMenu={isOpenMenu}
                     onMenuClick={onMenuClick}
@@ -36,7 +39,7 @@ const Layout = ({ children }) => {
                     simpleLayout={simpleLayout}>
                     {children}
                   </Grid>
-                </>
+                </BlazeAuthContextWrapper>
               ) : (
                 <Background>
                   <Login />

package/src/utils/menu-handler-singleton.js

@@ -22,10 +22,12 @@ export class MenuHandler {
     this.app = app;
   }
 
+  // eslint-disable-next-line no-dupe-class-members
   get app() {
     return this.app;
   }
 
+  // eslint-disable-next-line no-dupe-class-members
   get menuConfig() {
     return this.menuConfig;
   }