Skip to content

Commit

Permalink
Web console: fix service view actions when grouping (apache#10898)
Browse files Browse the repository at this point in the history
* fix service view actions when grouping

* fix test
  • Loading branch information
vogievetsky authored Mar 10, 2021
1 parent 5829432 commit c0fb326
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,7 @@ exports[`services view action services view 1`] = `
"width": 400,
},
Object {
"Aggregated": [Function],
"Cell": [Function],
"Header": "Actions",
"accessor": [Function],
Expand Down
4 changes: 3 additions & 1 deletion web-console/src/views/services-view/services-view.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -559,12 +559,14 @@ ORDER BY "rank" DESC, "service" DESC`;
width: ACTION_COLUMN_WIDTH,
accessor: row => row.worker,
filterable: false,
Cell: ({ value }) => {
Cell: ({ value, aggregated }) => {
if (aggregated) return '';
if (!value) return null;
const disabled = value.version === '';
const workerActions = this.getWorkerActions(value.host, disabled);
return <ActionCell actions={workerActions} />;
},
Aggregated: () => '',
},
]}
/>
Expand Down

0 comments on commit c0fb326

Please sign in to comment.