1 files changed, 23 insertions, 189 deletions

diff --git a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx
index 3d502b1aca0..e44b628aafd 100644
--- a/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx
+++ b/server/sonar-web/src/main/js/app/components/nav/global/GlobalNav.tsx
@@ -21,213 +21,47 @@ import * as React from 'react';
 import { connect } from 'react-redux';
 import { lazyLoadComponent } from 'sonar-ui-common/components/lazyLoadComponent';
 import NavBar from 'sonar-ui-common/components/ui/NavBar';
-import { parseDate } from 'sonar-ui-common/helpers/dates';
-import {
-  fetchPrismicFeatureNews,
-  fetchPrismicRefs,
-  PrismicFeatureNews
-} from '../../../../api/news';
-import { isSonarCloud } from '../../../../helpers/system';
 import { isLoggedIn } from '../../../../helpers/users';
-import {
-  getAppState,
-  getCurrentUser,
-  getCurrentUserSetting,
-  getGlobalSettingValue,
-  Store
-} from '../../../../store/rootReducer';
-import { setCurrentUserSetting } from '../../../../store/users';
+import { getAppState, getCurrentUser, Store } from '../../../../store/rootReducer';
 import { rawSizes } from '../../../theme';
 import EmbedDocsPopupHelper from '../../embed-docs-modal/EmbedDocsPopupHelper';
 import Search from '../../search/Search';
 import './GlobalNav.css';
-import GlobalNavBranding, { SonarCloudNavBranding } from './GlobalNavBranding';
+import GlobalNavBranding from './GlobalNavBranding';
 import GlobalNavMenu from './GlobalNavMenu';
-import GlobalNavUserContainer from './GlobalNavUserContainer';
+import GlobalNavUser from './GlobalNavUser';
 
 const GlobalNavPlus = lazyLoadComponent(() => import('./GlobalNavPlus'), 'GlobalNavPlus');
-const NotificationsSidebar = lazyLoadComponent(
-  () => import('../../notifications/NotificationsSidebar'),
-  'NotificationsSidebar'
-);
-const NavLatestNotification = lazyLoadComponent(
-  () => import('../../notifications/NavLatestNotification'),
-  'NavLatestNotification'
-);
 
-interface Props {
-  accessToken?: string;
-  appState: Pick<T.AppState, 'canAdmin' | 'globalPages' | 'organizationsEnabled' | 'qualifiers'>;
+export interface GlobalNavProps {
+  appState: Pick<T.AppState, 'canAdmin' | 'globalPages' | 'qualifiers'>;
   currentUser: T.CurrentUser;
   location: { pathname: string };
-  notificationsLastReadDate?: Date;
-  notificationsOptOut?: boolean;
-  setCurrentUserSetting: (setting: T.CurrentUserSetting) => void;
 }
 
-interface State {
-  notificationSidebar?: boolean;
-  loadingNews: boolean;
-  loadingMoreNews: boolean;
-  news: PrismicFeatureNews[];
-  newsPaging?: T.Paging;
-  newsRef?: string;
-}
-
-const PAGE_SIZE = 5;
-
-export class GlobalNav extends React.PureComponent<Props, State> {
-  mounted = false;
-  state: State = {
-    loadingNews: false,
-    loadingMoreNews: false,
-    news: [],
-    notificationSidebar: false
-  };
-
-  componentDidMount() {
-    this.mounted = true;
-    if (isSonarCloud()) {
-      this.fetchFeatureNews();
-    }
-  }
-
-  componentWillUnmount() {
-    this.mounted = false;
-  }
-
-  fetchFeatureNews = () => {
-    const { accessToken } = this.props;
-    if (accessToken) {
-      this.setState({ loadingNews: true });
-      fetchPrismicRefs()
-        .then(({ ref }) => {
-          if (this.mounted) {
-            this.setState({ newsRef: ref });
-          }
-          return ref;
-        })
-        .then(ref => fetchPrismicFeatureNews({ accessToken, ref, ps: PAGE_SIZE }))
-        .then(
-          ({ news, paging }) => {
-            if (this.mounted) {
-              this.setState({
-                loadingNews: false,
-                news,
-                newsPaging: paging
-              });
-            }
-          },
-          () => {
-            if (this.mounted) {
-              this.setState({ loadingNews: false });
-            }
-          }
-        );
-    }
-  };
-
-  fetchMoreFeatureNews = () => {
-    const { accessToken } = this.props;
-    const { newsPaging, newsRef } = this.state;
-    if (accessToken && newsPaging && newsRef) {
-      this.setState({ loadingMoreNews: true });
-      fetchPrismicFeatureNews({
-        accessToken,
-        ref: newsRef,
-        p: newsPaging.pageIndex + 1,
-        ps: PAGE_SIZE
-      }).then(
-        ({ news, paging }) => {
-          if (this.mounted) {
-            this.setState(state => ({
-              loadingMoreNews: false,
-              news: [...state.news, ...news],
-              newsPaging: paging
-            }));
-          }
-        },
-        () => {
-          if (this.mounted) {
-            this.setState({ loadingMoreNews: false });
-          }
-        }
-      );
-    }
-  };
-
-  handleOpenNotificationSidebar = () => {
-    this.setState({ notificationSidebar: true });
-    this.fetchFeatureNews();
-  };
-
-  handleCloseNotificationSidebar = () => {
-    this.setState({ notificationSidebar: false });
-    const lastNews = this.state.news[0];
-    const readDate = lastNews ? parseDate(lastNews.publicationDate).getTime() : Date.now();
-    this.props.setCurrentUserSetting({ key: 'notifications.readDate', value: readDate.toString() });
-  };
-
-  render() {
-    const { appState, currentUser } = this.props;
-    const { news } = this.state;
-    return (
-      <NavBar className="navbar-global" height={rawSizes.globalNavHeightRaw} id="global-navigation">
-        {isSonarCloud() ? <SonarCloudNavBranding /> : <GlobalNavBranding />}
-
-        <GlobalNavMenu {...this.props} />
-
-        <ul className="global-navbar-menu global-navbar-menu-right">
-          {isSonarCloud() && isLoggedIn(currentUser) && news.length > 0 && (
-            <NavLatestNotification
-              lastNews={news[0]}
-              notificationsLastReadDate={this.props.notificationsLastReadDate}
-              notificationsOptOut={this.props.notificationsOptOut}
-              onClick={this.handleOpenNotificationSidebar}
-              setCurrentUserSetting={this.props.setCurrentUserSetting}
-            />
-          )}
-          <EmbedDocsPopupHelper />
-          <Search appState={appState} currentUser={currentUser} />
-          {isLoggedIn(currentUser) && (
-            <GlobalNavPlus appState={appState} currentUser={currentUser} />
-          )}
-          <GlobalNavUserContainer appState={appState} currentUser={currentUser} />
-        </ul>
-        {isSonarCloud() && isLoggedIn(currentUser) && this.state.notificationSidebar && (
-          <NotificationsSidebar
-            fetchMoreFeatureNews={this.fetchMoreFeatureNews}
-            loading={this.state.loadingNews}
-            loadingMore={this.state.loadingMoreNews}
-            news={news}
-            notificationsLastReadDate={this.props.notificationsLastReadDate}
-            onClose={this.handleCloseNotificationSidebar}
-            paging={this.state.newsPaging}
-          />
-        )}
-      </NavBar>
-    );
-  }
+export function GlobalNav(props: GlobalNavProps) {
+  const { appState, currentUser, location } = props;
+  return (
+    <NavBar className="navbar-global" height={rawSizes.globalNavHeightRaw} id="global-navigation">
+      <GlobalNavBranding />
+
+      <GlobalNavMenu appState={appState} currentUser={currentUser} location={location} />
+
+      <ul className="global-navbar-menu global-navbar-menu-right">
+        <EmbedDocsPopupHelper />
+        <Search currentUser={currentUser} />
+        {isLoggedIn(currentUser) && <GlobalNavPlus appState={appState} currentUser={currentUser} />}
+        <GlobalNavUser currentUser={currentUser} />
+      </ul>
+    </NavBar>
+  );
 }
 
 const mapStateToProps = (state: Store) => {
-  const accessToken = getGlobalSettingValue(state, 'sonar.prismic.accessToken');
-  const notificationsLastReadDate = getCurrentUserSetting(state, 'notifications.readDate');
-  const notificationsOptOut = getCurrentUserSetting(state, 'notifications.optOut') === 'true';
-
   return {
     currentUser: getCurrentUser(state),
-    appState: getAppState(state),
-    accessToken: accessToken && accessToken.value,
-    notificationsLastReadDate: notificationsLastReadDate
-      ? parseDate(Number(notificationsLastReadDate))
-      : undefined,
-    notificationsOptOut
+    appState: getAppState(state)
   };
 };
 
-const mapDispatchToProps = {
-  setCurrentUserSetting
-};
-
-export default connect(mapStateToProps, mapDispatchToProps)(GlobalNav);
+export default connect(mapStateToProps)(GlobalNav);