aboutsummaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorStas Vilchik <vilchiks@gmail.com>2016-08-22 10:36:08 +0200
committerStas Vilchik <vilchiks@gmail.com>2016-08-23 11:42:54 +0200
commit502b4c6f0d3eca88237f9351f94c675203530184 (patch)
tree83d6bb448bad6839d3c94fbacf7fe2715ca98ec1 /server
parentff0d0ce04e82caa91f5d08286163d5fe8d5f9ec2 (diff)
downloadsonarqube-502b4c6f0d3eca88237f9351f94c675203530184.tar.gz
sonarqube-502b4c6f0d3eca88237f9351f94c675203530184.zip
SONAR-7848 Display task UUID in background page UI
Diffstat (limited to 'server')
-rw-r--r--server/sonar-web/src/main/js/apps/background-tasks/components/Task.js2
-rw-r--r--server/sonar-web/src/main/js/apps/background-tasks/components/TaskId.js34
-rw-r--r--server/sonar-web/src/main/js/apps/background-tasks/components/TaskType.js2
-rw-r--r--server/sonar-web/src/main/js/apps/background-tasks/components/Tasks.js13
4 files changed, 44 insertions, 7 deletions
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Task.js b/server/sonar-web/src/main/js/apps/background-tasks/components/Task.js
index 0f1c813fe48..a2084647461 100644
--- a/server/sonar-web/src/main/js/apps/background-tasks/components/Task.js
+++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Task.js
@@ -22,6 +22,7 @@ import shallowCompare from 'react-addons-shallow-compare';
import TaskStatus from './TaskStatus';
import TaskComponent from './TaskComponent';
+import TaskId from './TaskId';
import TaskDay from './TaskDay';
import TaskDate from './TaskDate';
import TaskExecutionTime from './TaskExecutionTime';
@@ -57,6 +58,7 @@ export default class Task extends React.Component {
<tr>
<TaskStatus task={task}/>
<TaskComponent task={task} types={types}/>
+ <TaskId task={task}/>
<TaskDay task={task} prevTask={prevTask}/>
<TaskDate date={task.submittedAt} baseDate={task.submittedAt} format="LTS"/>
<TaskDate date={task.startedAt} baseDate={task.submittedAt} format="LTS"/>
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskId.js b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskId.js
new file mode 100644
index 00000000000..1cf24890c16
--- /dev/null
+++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskId.js
@@ -0,0 +1,34 @@
+/*
+ * SonarQube
+ * Copyright (C) 2009-2016 SonarSource SA
+ * mailto:contact AT sonarsource DOT com
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 3 of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ */
+import React from 'react';
+
+import { translate } from '../../../helpers/l10n';
+
+const TaskId = ({ task }) => {
+ return (
+ <td className="thin nowrap">
+ <div className="note">
+ {task.id}
+ </div>
+ </td>
+ );
+};
+
+export default TaskId;
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskType.js b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskType.js
index 3877801818c..ed10f60f62b 100644
--- a/server/sonar-web/src/main/js/apps/background-tasks/components/TaskType.js
+++ b/server/sonar-web/src/main/js/apps/background-tasks/components/TaskType.js
@@ -23,7 +23,7 @@ import { translate } from '../../../helpers/l10n';
const TaskType = ({ task }) => {
return (
- <span className="note spacer-left">
+ <span className="note nowrap spacer-left">
{'['}
{translate('background_task.type', task.type)}
{']'}
diff --git a/server/sonar-web/src/main/js/apps/background-tasks/components/Tasks.js b/server/sonar-web/src/main/js/apps/background-tasks/components/Tasks.js
index 0cb1ddf0822..d6a9633354f 100644
--- a/server/sonar-web/src/main/js/apps/background-tasks/components/Tasks.js
+++ b/server/sonar-web/src/main/js/apps/background-tasks/components/Tasks.js
@@ -49,13 +49,14 @@ export default class Tasks extends React.Component {
<table className={className}>
<thead>
<tr>
+ <th>{translate('background_tasks.table.status')}</th>
+ <th>{translate('background_tasks.table.task')}</th>
+ <th>{translate('background_tasks.table.id')}</th>
<th>&nbsp;</th>
- <th>&nbsp;</th>
- <th>&nbsp;</th>
- <th>{translate('background_tasks.table.submitted')}</th>
- <th>{translate('background_tasks.table.started')}</th>
- <th>{translate('background_tasks.table.finished')}</th>
- <th>{translate('background_tasks.table.duration')}</th>
+ <th className="text-right">{translate('background_tasks.table.submitted')}</th>
+ <th className="text-right">{translate('background_tasks.table.started')}</th>
+ <th className="text-right">{translate('background_tasks.table.finished')}</th>
+ <th className="text-right">{translate('background_tasks.table.duration')}</th>
<th>&nbsp;</th>
</tr>
</thead>