Skip to content

Commit

Permalink
Removed "last updated by" sections from the UI. (opensearch-project#767)
Browse files Browse the repository at this point in the history
* Removed "last updated by" section from the UI as the SearchMonitor API can no longer return that info.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

* Updated cypress workflow.

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

---------

Signed-off-by: AWSHurneyt <hurneyt@amazon.com>

(cherry picked from commit 1bea77f)
Signed-off-by: AWSHurneyt <hurneyt@amazon.com>
  • Loading branch information
AWSHurneyt committed Mar 14, 2024
1 parent 964d4de commit 67d13bd
Show file tree
Hide file tree
Showing 7 changed files with 2 additions and 54 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cypress-workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ jobs:
- name: Run OpenSearch Dashboards server
run: |
cd OpenSearch-Dashboards
yarn start --no-base-path --no-watch &
yarn start --no-base-path --no-watch --server.host="0.0.0.0" &
sleep 300
# timeout 300 bash -c 'while [[ "$(curl -s -o /dev/null -w ''%{http_code}'' localhost:5601/api/status)" != "200" ]]; do sleep 5; done'
- name: Run Cypress tests
Expand Down
2 changes: 1 addition & 1 deletion cypress/integration/monitors_dashboard_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ describe('Monitors dashboard page', () => {

it('Displays expected number of alerts', () => {
// Ensure the 'Monitor name' column is sorted in ascending order by sorting another column first
cy.contains('Last updated by').click({ force: true });
cy.contains('Last notification time').click({ force: true });
cy.contains('Monitor name').click({ force: true });

testMonitors.forEach((entry) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,13 +42,4 @@ export const staticColumns = [
}
},
},
{
field: 'user',
name: 'Last updated by',
sortable: true,
truncateText: true,
textOnly: true,
width: '100px',
render: (value) => (value && value.name ? value.name : '-'),
},
];
Original file line number Diff line number Diff line change
Expand Up @@ -143,20 +143,6 @@ exports[`MonitorOverview renders 1`] = `
</div>
</div>
</div>
<div
class="euiFlexItem"
>
<div
class="euiText euiText--extraSmall"
>
<strong>
Last updated by
</strong>
<div>
-
</div>
</div>
</div>
</div>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -115,15 +115,5 @@ export default function getOverviewStats(
header: 'Monitor version number',
value: monitorVersion,
},
{
/* There are 3 cases:
1. Monitors created by older versions and never updated.
These monitors won’t have User details in the monitor object. `monitor.user` will be null.
2. Monitors are created when security plugin is disabled, these will have empty User object.
(`monitor.user.name`, `monitor.user.roles` are empty )
3. Monitors are created when security plugin is enabled, these will have an User object. */
header: 'Last updated by',
value: monitor.user && monitor.user.name ? monitor.user.name : '-',
},
];
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ describe('getOverviewStats', () => {
header: 'Monitor version number',
value: monitorVersion,
},
{
header: 'Last updated by',
value: monitor.user.name,
},
]);
});
});
15 changes: 0 additions & 15 deletions public/pages/Monitors/containers/Monitors/utils/tableUtils.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,21 +27,6 @@ export const columns = [
</EuiLink>
),
},
{
field: 'user',
name: 'Last updated by',
sortable: true,
truncateText: true,
textOnly: true,
/* There are 3 cases:
1. Monitors created by older versions and never updated.
These monitors won’t have User details in the monitor object. `monitor.user` will be null.
2. Monitors are created when security plugin is disabled, these will have empty User object.
(`monitor.user.name`, `monitor.user.roles` are empty )
3. Monitors are created when security plugin is enabled, these will have an User object. */
render: (_, item) =>
item.monitor.user && item.monitor.user.name ? item.monitor.user.name : '-',
},
{
field: 'latestAlert',
name: 'Latest alert',
Expand Down

0 comments on commit 67d13bd

Please sign in to comment.