This is an automated email from the ASF dual-hosted git repository.

jan pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/couchdb-fauxton.git


The following commit(s) were added to refs/heads/main by this push:
     new 1388f87b Add node to Active Tasks
1388f87b is described below

commit 1388f87b18dc00594b2db97b393b0eae97774f21
Author: Liquid-NeoN <[email protected]>
AuthorDate: Wed Jan 3 11:05:14 2024 +0200

    Add node to Active Tasks
    
    Include Node in Active Tasks Component as it was already in the api 
response.
---
 app/addons/activetasks/assets/scss/activetasks.scss    | 12 ++++++++----
 app/addons/activetasks/components/tablebodycontents.js |  2 ++
 app/addons/activetasks/components/tableheader.js       |  1 +
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/app/addons/activetasks/assets/scss/activetasks.scss 
b/app/addons/activetasks/assets/scss/activetasks.scss
index 44bda098..fe8a9f59 100644
--- a/app/addons/activetasks/assets/scss/activetasks.scss
+++ b/app/addons/activetasks/assets/scss/activetasks.scss
@@ -31,15 +31,19 @@
       }
 
       &.header-database {
-        width: 30%;
+        width: 25%;
       }
 
       &.header-tarted-on {
-        width: 13%;
+        width: 10%;
       }
 
       &.header-updated-on {
-        width: 13%;
+        width: 10%;
+      }
+
+      &.header-node {
+        width: 15%;
       }
 
       &.header-pid {
@@ -47,7 +51,7 @@
       }
 
       &.header-progress {
-        width: 23%;
+        width: 20%;
       }
 
       .fonticon-up-dir,
diff --git a/app/addons/activetasks/components/tablebodycontents.js 
b/app/addons/activetasks/components/tablebodycontents.js
index e8c6e2b5..bd583cdd 100644
--- a/app/addons/activetasks/components/tablebodycontents.js
+++ b/app/addons/activetasks/components/tablebodycontents.js
@@ -79,6 +79,7 @@ export default class ActiveTaskTableBodyContents extends 
React.Component {
       objectField: activeTasksHelpers.getDatabaseFieldMessage(item),
       started_on: activeTasksHelpers.getTimeInfo(item.started_on),
       updated_on: activeTasksHelpers.getTimeInfo(item.updated_on),
+      node: item.node,
       pid: item.pid.replace(/[<>]/g, ''),
       progress: activeTasksHelpers.getProgressMessage(item),
     };
@@ -109,6 +110,7 @@ export default class ActiveTaskTableBodyContents extends 
React.Component {
         <td>{objectFieldMsg}</td>
         <td>{startedOnMsg}</td>
         <td>{updatedOnMsg}</td>
+        <td>{rowData.node}</td>
         <td>{rowData.pid}</td>
         <td>{progressMsg}</td>
       </tr>
diff --git a/app/addons/activetasks/components/tableheader.js 
b/app/addons/activetasks/components/tableheader.js
index e1e91052..bccaf51d 100644
--- a/app/addons/activetasks/components/tableheader.js
+++ b/app/addons/activetasks/components/tableheader.js
@@ -51,6 +51,7 @@ export default class ActiveTasksTableHeader extends 
React.Component {
       ['database', 'Database'],
       ['started-on', 'Started on'],
       ['updated-on', 'Updated on'],
+      ['node', 'Node'],
       ['pid', 'PID'],
       ['progress', 'Status']
     ]

Reply via email to