Display MSS notices on all MailPoet pages
[MAILPOET-6026]
This commit is contained in:
@@ -5,6 +5,7 @@ import { TopBarWithBeamer } from 'common/top-bar/top-bar';
|
|||||||
import { SlotFillProvider } from '@wordpress/components';
|
import { SlotFillProvider } from '@wordpress/components';
|
||||||
import { useSelect } from '@wordpress/data';
|
import { useSelect } from '@wordpress/data';
|
||||||
import { registerTranslations } from 'common';
|
import { registerTranslations } from 'common';
|
||||||
|
import { MssAccessNotices } from 'notices/mss-access-notices';
|
||||||
import { initializeApi } from './api';
|
import { initializeApi } from './api';
|
||||||
import { legacyAutomationCount } from './config';
|
import { legacyAutomationCount } from './config';
|
||||||
import { createStore, storeName } from './listing/store';
|
import { createStore, storeName } from './listing/store';
|
||||||
@@ -72,6 +73,7 @@ function Automations(): JSX.Element {
|
|||||||
<>
|
<>
|
||||||
<TopBarWithBeamer />
|
<TopBarWithBeamer />
|
||||||
<Notices />
|
<Notices />
|
||||||
|
<MssAccessNotices />
|
||||||
<Content />
|
<Content />
|
||||||
</>
|
</>
|
||||||
);
|
);
|
||||||
|
@@ -1,6 +1,7 @@
|
|||||||
import { createRoot } from 'react-dom/client';
|
import { createRoot } from 'react-dom/client';
|
||||||
import { HashRouter, Route } from 'react-router-dom';
|
import { HashRouter, Route } from 'react-router-dom';
|
||||||
import { GlobalContext, useGlobalContextValue } from 'context';
|
import { GlobalContext, useGlobalContextValue } from 'context';
|
||||||
|
import { MssAccessNotices } from 'notices/mss-access-notices';
|
||||||
import { Notices } from 'notices/notices.jsx';
|
import { Notices } from 'notices/notices.jsx';
|
||||||
import { registerTranslations, withBoundary } from 'common';
|
import { registerTranslations, withBoundary } from 'common';
|
||||||
import { FormList } from './list.jsx';
|
import { FormList } from './list.jsx';
|
||||||
@@ -10,6 +11,7 @@ function App() {
|
|||||||
<GlobalContext.Provider value={useGlobalContextValue(window)}>
|
<GlobalContext.Provider value={useGlobalContextValue(window)}>
|
||||||
<HashRouter>
|
<HashRouter>
|
||||||
<Notices />
|
<Notices />
|
||||||
|
<MssAccessNotices />
|
||||||
<Route path="*" render={withBoundary(FormList)} />
|
<Route path="*" render={withBoundary(FormList)} />
|
||||||
</HashRouter>
|
</HashRouter>
|
||||||
</GlobalContext.Provider>
|
</GlobalContext.Provider>
|
||||||
|
@@ -5,6 +5,7 @@ import { SystemInfo } from 'help/system-info.tsx';
|
|||||||
import { SystemStatus } from 'help/system-status.jsx';
|
import { SystemStatus } from 'help/system-status.jsx';
|
||||||
import { YourPrivacy } from 'help/your-privacy.jsx';
|
import { YourPrivacy } from 'help/your-privacy.jsx';
|
||||||
import { GlobalContext, useGlobalContextValue } from 'context';
|
import { GlobalContext, useGlobalContextValue } from 'context';
|
||||||
|
import { MssAccessNotices } from 'notices/mss-access-notices';
|
||||||
import { Notices } from 'notices/notices.jsx';
|
import { Notices } from 'notices/notices.jsx';
|
||||||
import { RoutedTabs } from '../common/tabs/routed-tabs';
|
import { RoutedTabs } from '../common/tabs/routed-tabs';
|
||||||
import { registerTranslations, Tab } from '../common';
|
import { registerTranslations, Tab } from '../common';
|
||||||
@@ -15,6 +16,7 @@ function App() {
|
|||||||
<GlobalContext.Provider value={useGlobalContextValue(window)}>
|
<GlobalContext.Provider value={useGlobalContextValue(window)}>
|
||||||
<TopBar />
|
<TopBar />
|
||||||
<Notices />
|
<Notices />
|
||||||
|
<MssAccessNotices />
|
||||||
<RoutedTabs activeKey="knowledgeBase">
|
<RoutedTabs activeKey="knowledgeBase">
|
||||||
<Tab
|
<Tab
|
||||||
key="knowledgeBase"
|
key="knowledgeBase"
|
||||||
|
@@ -1,3 +1,4 @@
|
|||||||
|
import { MssAccessNotices } from 'notices/mss-access-notices';
|
||||||
import { Notices } from 'notices/notices.jsx';
|
import { Notices } from 'notices/notices.jsx';
|
||||||
import { Loading } from 'common/loading';
|
import { Loading } from 'common/loading';
|
||||||
import { t } from 'common/functions';
|
import { t } from 'common/functions';
|
||||||
@@ -23,6 +24,7 @@ export function Settings() {
|
|||||||
<TopBar />
|
<TopBar />
|
||||||
{isSaving && <Loading />}
|
{isSaving && <Loading />}
|
||||||
<Notices />
|
<Notices />
|
||||||
|
<MssAccessNotices />
|
||||||
<UnsavedChangesNotice storeName="mailpoet-settings" />
|
<UnsavedChangesNotice storeName="mailpoet-settings" />
|
||||||
<RoutedTabs activeKey="basics">
|
<RoutedTabs activeKey="basics">
|
||||||
<Tab
|
<Tab
|
||||||
|
Reference in New Issue
Block a user