aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPascal Mugnier <pascal.mugnier@sonarsource.com>2018-05-31 09:26:26 +0200
committerSonarTech <sonartech@sonarsource.com>2018-06-05 20:20:51 +0200
commitb540b6744affabae0fe53a9a5fb926704f1a0a17 (patch)
tree14f098efe7db908f95c42c512e3875c539e8700b
parent81645d024b9fbc057f0fe0cea9ebf3b43298f681 (diff)
downloadsonarqube-b540b6744affabae0fe53a9a5fb926704f1a0a17.tar.gz
sonarqube-b540b6744affabae0fe53a9a5fb926704f1a0a17.zip
SONAR-10819 Word breaks in error message
-rw-r--r--server/sonar-web/src/main/js/components/controls/GlobalMessages.css1
-rw-r--r--server/sonar-web/src/main/js/components/controls/GlobalMessages.tsx9
2 files changed, 8 insertions, 2 deletions
diff --git a/server/sonar-web/src/main/js/components/controls/GlobalMessages.css b/server/sonar-web/src/main/js/components/controls/GlobalMessages.css
index 6d0f5054a3e..8a819383cff 100644
--- a/server/sonar-web/src/main/js/components/controls/GlobalMessages.css
+++ b/server/sonar-web/src/main/js/components/controls/GlobalMessages.css
@@ -24,7 +24,6 @@
left: 50%;
width: 350px;
margin-left: -175px;
- word-break: break-all;
}
.process-spinner {
diff --git a/server/sonar-web/src/main/js/components/controls/GlobalMessages.tsx b/server/sonar-web/src/main/js/components/controls/GlobalMessages.tsx
index 24edc1ac4e4..4f91aaa0792 100644
--- a/server/sonar-web/src/main/js/components/controls/GlobalMessages.tsx
+++ b/server/sonar-web/src/main/js/components/controls/GlobalMessages.tsx
@@ -35,6 +35,13 @@ interface Props {
}
export default class GlobalMessages extends React.PureComponent<Props> {
+ cutLongWords = (message: string) => {
+ return message
+ .split(' ')
+ .map(word => (word.length > 35 ? word.substr(0, 35) + '...' : word))
+ .join(' ');
+ };
+
renderMessage = (message: Message) => {
const className = classNames('process-spinner', 'shown', {
'process-spinner-failed': message.level === 'ERROR',
@@ -42,7 +49,7 @@ export default class GlobalMessages extends React.PureComponent<Props> {
});
return (
<div className={className} key={message.id}>
- {message.message}
+ {this.cutLongWords(message.message)}
<ButtonIcon
className="button-small process-spinner-close"
color="#fff"