diff options
author | Guillaume Peoc'h <guillaume.peoch@sonarsource.com> | 2022-06-01 18:25:00 +0200 |
---|---|---|
committer | sonartech <sonartech@sonarsource.com> | 2022-06-02 20:03:19 +0000 |
commit | 732dee3ca847c1cb0626b20162f8516cddec5397 (patch) | |
tree | 36a71654459df23e031e3f82e3d12e285db83bd7 /server | |
parent | 10765dd52e9173fee3f50b48de911297d513cd74 (diff) | |
download | sonarqube-732dee3ca847c1cb0626b20162f8516cddec5397.tar.gz sonarqube-732dee3ca847c1cb0626b20162f8516cddec5397.zip |
SONAR-16435 Clarify date - time on Project Overview
Diffstat (limited to 'server')
3 files changed, 23 insertions, 13 deletions
diff --git a/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx b/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx index 3e78bec5863..27fc83ce271 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/HeaderMeta.tsx @@ -18,12 +18,13 @@ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ import * as React from 'react'; +import { useIntl } from 'react-intl'; import BranchStatus from '../../../../components/common/BranchStatus'; import HomePageSelect from '../../../../components/controls/HomePageSelect'; import DetachIcon from '../../../../components/icons/DetachIcon'; -import DateTimeFormatter from '../../../../components/intl/DateTimeFormatter'; +import { formatterOption } from '../../../../components/intl/DateTimeFormatter'; import { isBranch, isPullRequest } from '../../../../helpers/branch-like'; -import { translate } from '../../../../helpers/l10n'; +import { translate, translateWithParameters } from '../../../../helpers/l10n'; import { BranchLike } from '../../../../types/branch-like'; import { ComponentQualifier } from '../../../../types/component'; import { TaskWarning } from '../../../../types/tasks'; @@ -48,6 +49,7 @@ export function HeaderMeta(props: HeaderMetaProps) { const currentPage = getCurrentPage(component, branchLike); const displayVersion = component.version !== undefined && isABranch; + const lastAnalysisDate = useIntl().formatDate(component.analysisDate, formatterOption); return ( <> @@ -63,8 +65,13 @@ export function HeaderMeta(props: HeaderMetaProps) { </span> )} {component.analysisDate && ( - <span className="spacer-left nowrap note"> - <DateTimeFormatter date={component.analysisDate} /> + <span + title={translateWithParameters( + 'overview.project.last_analysis.date_time', + lastAnalysisDate + )} + className="spacer-left nowrap note"> + {lastAnalysisDate} </span> )} {displayVersion && ( diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/HeaderMeta-test.tsx b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/HeaderMeta-test.tsx index a8ca42031b7..36cd81491a2 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/HeaderMeta-test.tsx +++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/HeaderMeta-test.tsx @@ -27,6 +27,12 @@ import { mockCurrentUser } from '../../../../../helpers/testMocks'; import { ComponentQualifier } from '../../../../../types/component'; import { getCurrentPage, HeaderMeta, HeaderMetaProps } from '../HeaderMeta'; +jest.mock('react-intl', () => ({ + useIntl: jest.fn().mockImplementation(() => ({ + formatDate: jest.fn().mockImplementation(() => '2017-01-02T00:00:00.000Z') + })) +})); + it('should render correctly for a branch', () => { const wrapper = shallowRender(); expect(wrapper).toMatchSnapshot(); diff --git a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/HeaderMeta-test.tsx.snap b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/HeaderMeta-test.tsx.snap index 8069b500e19..677f9989be4 100644 --- a/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/HeaderMeta-test.tsx.snap +++ b/server/sonar-web/src/main/js/app/components/nav/component/__tests__/__snapshots__/HeaderMeta-test.tsx.snap @@ -30,10 +30,9 @@ exports[`should render correctly for a branch 1`] = ` </span> <span className="spacer-left nowrap note" + title="overview.project.last_analysis.date_time.2017-01-02T00:00:00.000Z" > - <DateTimeFormatter - date="2017-01-02T00:00:00.000Z" - /> + 2017-01-02T00:00:00.000Z </span> <span className="spacer-left nowrap note" @@ -84,10 +83,9 @@ exports[`should render correctly for a main project branch 1`] = ` </span> <span className="spacer-left nowrap note" + title="overview.project.last_analysis.date_time.2017-01-02T00:00:00.000Z" > - <DateTimeFormatter - date="2017-01-02T00:00:00.000Z" - /> + 2017-01-02T00:00:00.000Z </span> <span className="spacer-left nowrap note" @@ -179,10 +177,9 @@ exports[`should render correctly for a pull request 1`] = ` </span> <span className="spacer-left nowrap note" + title="overview.project.last_analysis.date_time.2017-01-02T00:00:00.000Z" > - <DateTimeFormatter - date="2017-01-02T00:00:00.000Z" - /> + 2017-01-02T00:00:00.000Z </span> </div> <div |