From 2eaddb2872869d8f9a4fc0d09fbb41ae7f7e5d4e Mon Sep 17 00:00:00 2001 From: =?utf8?q?Gr=C3=A9goire=20Aubert?= Date: Wed, 23 Aug 2017 14:41:21 +0200 Subject: [PATCH] SONAR-9436 Expose intl context and some date components --- .../src/main/js/app/components/extensions/Extension.js | 5 ++++- server/sonar-web/src/main/js/app/utils/exposeLibraries.js | 6 ++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/server/sonar-web/src/main/js/app/components/extensions/Extension.js b/server/sonar-web/src/main/js/app/components/extensions/Extension.js index 7afb2b642e8..d7657b83365 100644 --- a/server/sonar-web/src/main/js/app/components/extensions/Extension.js +++ b/server/sonar-web/src/main/js/app/components/extensions/Extension.js @@ -22,6 +22,7 @@ import React from 'react'; import Helmet from 'react-helmet'; import { connect } from 'react-redux'; import { withRouter } from 'react-router'; +import { injectIntl } from 'react-intl'; import { addGlobalErrorMessage } from '../../../store/globalMessages/duck'; import { getCurrentUser } from '../../../store/rootReducer'; import { translate } from '../../../helpers/l10n'; @@ -35,6 +36,7 @@ type Props = { key: string, name: string }, + intl: Object, location: { hash: string }, onFail: string => void, options?: {}, @@ -74,6 +76,7 @@ class Extension extends React.PureComponent { store, el: this.container, currentUser: this.props.currentUser, + intl: this.props.intl, location: this.props.location, router: this.props.router, ...this.props.options @@ -110,4 +113,4 @@ const mapStateToProps = state => ({ const mapDispatchToProps = { onFail: addGlobalErrorMessage }; -export default connect(mapStateToProps, mapDispatchToProps)(withRouter(Extension)); +export default connect(mapStateToProps, mapDispatchToProps)(injectIntl(withRouter(Extension))); diff --git a/server/sonar-web/src/main/js/app/utils/exposeLibraries.js b/server/sonar-web/src/main/js/app/utils/exposeLibraries.js index 71635357dac..e69bb3ab64a 100644 --- a/server/sonar-web/src/main/js/app/utils/exposeLibraries.js +++ b/server/sonar-web/src/main/js/app/utils/exposeLibraries.js @@ -24,6 +24,9 @@ import Modal from 'react-modal'; import * as measures from '../../helpers/measures'; import * as request from '../../helpers/request'; import * as icons from '../../components/icons-components/icons'; +import DateFromNow from '../../components/intl/DateFromNow'; +import DateFormatter from '../../components/intl/DateFormatter'; +import DateTimeFormatter from '../../components/intl/DateTimeFormatter'; import FavoriteContainer from '../../components/controls/FavoriteContainer'; import ListFooter from '../../components/controls/ListFooter'; import Tooltip from '../../components/controls/Tooltip'; @@ -40,6 +43,9 @@ const exposeLibraries = () => { window.SonarMeasures = measures; window.SonarRequest = request; window.SonarComponents = { + DateFromNow, + DateFormatter, + DateTimeFormatter, FavoriteContainer, ListFooter, Modal, -- 2.39.5