Browse Source

SONARCLOUD-158 Update message when system is starting

tags/7.5
Pascal Mugnier 5 years ago
parent
commit
54445562f1

+ 30
- 20
server/sonar-web/src/main/js/apps/maintenance/components/App.tsx View File

import TimeFormatter from '../../../components/intl/TimeFormatter'; import TimeFormatter from '../../../components/intl/TimeFormatter';
import { Button } from '../../../components/ui/buttons'; import { Button } from '../../../components/ui/buttons';
import { translate } from '../../../helpers/l10n'; import { translate } from '../../../helpers/l10n';
import InstanceMessage from '../../../components/common/InstanceMessage';
import { getBaseUrl } from '../../../helpers/urls'; import { getBaseUrl } from '../../../helpers/urls';
import { isSonarCloud } from '../../../helpers/system';
import '../styles.css'; import '../styles.css';


interface Props { interface Props {
{status === 'OFFLINE' && ( {status === 'OFFLINE' && (
<> <>
<h1 className="maintenance-title text-danger"> <h1 className="maintenance-title text-danger">
{translate('maintenance.sonarqube_is_offline')}
<InstanceMessage message={translate('maintenance.is_offline')} />
</h1> </h1>
<p className="maintenance-text">
{translate('maintenance.sonarqube_is_offline.text')}
</p>
{!isSonarCloud() && (
<p className="maintenance-text">
{translate('maintenance.sonarqube_is_offline.text')}
</p>
)}
<p className="maintenance-text text-center"> <p className="maintenance-text text-center">
<a href={getBaseUrl() + '/'}>{translate('maintenance.try_again')}</a> <a href={getBaseUrl() + '/'}>{translate('maintenance.try_again')}</a>
</p> </p>


{status === 'UP' && ( {status === 'UP' && (
<> <>
<h1 className="maintenance-title">{translate('maintenance.sonarqube_is_up')}</h1>
<h1 className="maintenance-title">
<InstanceMessage message={translate('maintenance.is_up')} />
</h1>
<p className="maintenance-text text-center"> <p className="maintenance-text text-center">
{translate('maintenance.all_systems_opetational')} {translate('maintenance.all_systems_opetational')}
</p> </p>
{status === 'STARTING' && ( {status === 'STARTING' && (
<> <>
<h1 className="maintenance-title"> <h1 className="maintenance-title">
{translate('maintenance.sonarqube_is_starting')}
<InstanceMessage message={translate('maintenance.is_starting')} />
</h1> </h1>
<p className="maintenance-spinner"> <p className="maintenance-spinner">
<i className="spinner" /> <i className="spinner" />
{status === 'DOWN' && ( {status === 'DOWN' && (
<> <>
<h1 className="maintenance-title text-danger"> <h1 className="maintenance-title text-danger">
{translate('maintenance.sonarqube_is_down')}
<InstanceMessage message={translate('maintenance.is_down')} />
</h1> </h1>
<p className="maintenance-text"> <p className="maintenance-text">
{translate('maintenance.sonarqube_is_down.text')} {translate('maintenance.sonarqube_is_down.text')}
{(status === 'DB_MIGRATION_NEEDED' || status === 'DB_MIGRATION_RUNNING') && ( {(status === 'DB_MIGRATION_NEEDED' || status === 'DB_MIGRATION_RUNNING') && (
<> <>
<h1 className="maintenance-title"> <h1 className="maintenance-title">
{translate('maintenance.sonarqube_is_under_maintenance')}
<InstanceMessage message={translate('maintenance.is_under_maintenance')} />
</h1> </h1>
<p
className="maintenance-text"
dangerouslySetInnerHTML={{
__html: translate('maintenance.sonarqube_is_under_maintenance.1')
}}
/>
<p
className="maintenance-text"
dangerouslySetInnerHTML={{
__html: translate('maintenance.sonarqube_is_under_maintenance.2')
}}
/>
{!isSonarCloud() && (
<>
<p
className="maintenance-text"
dangerouslySetInnerHTML={{
__html: translate('maintenance.sonarqube_is_under_maintenance.1')
}}
/>
<p
className="maintenance-text"
dangerouslySetInnerHTML={{
__html: translate('maintenance.sonarqube_is_under_maintenance.2')
}}
/>
</>
)}
</> </>
)} )}



+ 18
- 6
server/sonar-web/src/main/js/apps/maintenance/components/__tests__/__snapshots__/App-test.tsx.snap View File

<h1 <h1
className="maintenance-title" className="maintenance-title"
> >
maintenance.sonarqube_is_under_maintenance
<InstanceMessage
message="maintenance.is_under_maintenance"
/>
</h1> </h1>
<p <p
className="maintenance-text" className="maintenance-text"
<h1 <h1
className="maintenance-title" className="maintenance-title"
> >
maintenance.sonarqube_is_under_maintenance
<InstanceMessage
message="maintenance.is_under_maintenance"
/>
</h1> </h1>
<p <p
className="maintenance-text" className="maintenance-text"
<h1 <h1
className="maintenance-title text-danger" className="maintenance-title text-danger"
> >
maintenance.sonarqube_is_down
<InstanceMessage
message="maintenance.is_down"
/>
</h1> </h1>
<p <p
className="maintenance-text" className="maintenance-text"
<h1 <h1
className="maintenance-title text-danger" className="maintenance-title text-danger"
> >
maintenance.sonarqube_is_offline
<InstanceMessage
message="maintenance.is_offline"
/>
</h1> </h1>
<p <p
className="maintenance-text" className="maintenance-text"
<h1 <h1
className="maintenance-title" className="maintenance-title"
> >
maintenance.sonarqube_is_starting
<InstanceMessage
message="maintenance.is_starting"
/>
</h1> </h1>
<p <p
className="maintenance-spinner" className="maintenance-spinner"
<h1 <h1
className="maintenance-title" className="maintenance-title"
> >
maintenance.sonarqube_is_up
<InstanceMessage
message="maintenance.is_up"
/>
</h1> </h1>
<p <p
className="maintenance-text text-center" className="maintenance-text text-center"

+ 5
- 5
sonar-core/src/main/resources/org/sonar/l10n/core.properties View File

maintenance.upgrade=Upgrade maintenance.upgrade=Upgrade
maintenance.database_migration=Database Migration maintenance.database_migration=Database Migration
maintenance.database_is_up_to_date=Database is up-to-date maintenance.database_is_up_to_date=Database is up-to-date
maintenance.sonarqube_is_down=SonarQube is down
maintenance.is_down={instance} is down
maintenance.sonarqube_is_down.text=Something went wrong. Please contact your system administrator. maintenance.sonarqube_is_down.text=Something went wrong. Please contact your system administrator.
maintenance.try_again=Try Again maintenance.try_again=Try Again
maintenance.sonarqube_is_under_maintenance=SonarQube is under maintenance
maintenance.is_under_maintenance={instance} is under maintenance
maintenance.sonarqube_is_under_maintenance.1=While waiting, you might want to investigate <a href="https://redirect.sonarsource.com/doc/plugin-library.html">new plugins</a> to extend the current functionality. maintenance.sonarqube_is_under_maintenance.1=While waiting, you might want to investigate <a href="https://redirect.sonarsource.com/doc/plugin-library.html">new plugins</a> to extend the current functionality.
maintenance.sonarqube_is_under_maintenance.2=If you are an administrator and have no idea why this message is being shown, you should read the <a href="https://redirect.sonarsource.com/doc/upgrading.html">upgrade guide</a>. maintenance.sonarqube_is_under_maintenance.2=If you are an administrator and have no idea why this message is being shown, you should read the <a href="https://redirect.sonarsource.com/doc/upgrading.html">upgrade guide</a>.
maintenance.sonarqube_is_starting=SonarQube is starting
maintenance.sonarqube_is_up=SonarQube is up
maintenance.is_starting={instance} is starting
maintenance.is_up={instance} is up
maintenance.all_systems_opetational=All systems operational. maintenance.all_systems_opetational=All systems operational.
maintenance.sonarqube_is_offline=SonarQube is offline
maintenance.is_offline={instance} is offline
maintenance.sonarqube_is_offline.text=The connection to SonarQube is lost. Please contact your system administrator. maintenance.sonarqube_is_offline.text=The connection to SonarQube is lost. Please contact your system administrator.





Loading…
Cancel
Save