Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove last updated backported to 1.3 #808

Merged
merged 3 commits into from
Nov 22, 2023
Merged

remove last updated backported to 1.3 #808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0b9d87d
remove last updated backported to 2.2
kohinoor98 Nov 16, 2023
04100b1
updating test snapshot
kohinoor98 Nov 21, 2023
6305274
Removed "last updated by" sections from the UI. (#767)
AWSHurneyt Oct 25, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/cypress-workflow.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@ name: E2E Cypress tests
on:
pull_request:
branches:
- "*"
- '*'
push:
branches:
- "*"
- '*'
env:
OPENSEARCH_DASHBOARDS_VERSION: '1.3'
OPENSEARCH_VERSION: '1.3.9-SNAPSHOT'
Expand Down Expand Up @@ -68,7 +68,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
174 changes: 6 additions & 168 deletions ...ages/Destinations/containers/DestinationsList/__snapshots__/DestinationsList.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -808,15 +808,6 @@ exports[`DestinationsList renders 1`] = `
"truncateText": true,
"width": "100px",
},
Object {
"field": "user",
"name": "Last updated by",
"render": [Function],
"sortable": true,
"textOnly": true,
"truncateText": true,
"width": "100px",
},
Object {
"actions": Array [
Object {
Expand Down Expand Up @@ -916,13 +907,6 @@ exports[`DestinationsList renders 1`] = `
"name": "Destination type",
"onSort": [Function],
},
Object {
"isSortAscending": undefined,
"isSorted": false,
"key": "_data_s_user_2",
"name": "Last updated by",
"onSort": [Function],
},
]
}
>
Expand Down Expand Up @@ -1201,74 +1185,9 @@ exports[`DestinationsList renders 1`] = `
</button>
</th>
</EuiTableHeaderCell>
<EuiTableHeaderCell
align="left"
data-test-subj="tableHeaderCell_user_2"
isSorted={false}
key="_data_h_user_2"
onSort={[Function]}
width="100px"
>
<th
aria-live="polite"
aria-sort="none"
className="euiTableHeaderCell"
data-test-subj="tableHeaderCell_user_2"
role="columnheader"
scope="col"
style={
Object {
"width": "100px",
}
}
>
<button
className="euiTableHeaderButton"
data-test-subj="tableHeaderSortButton"
onClick={[Function]}
type="button"
>
<span
className="euiTableCellContent"
>
<EuiInnerText>
<EuiI18n
default="{innerText}; Sorted in {ariaSortValue} order"
token="euiTableHeaderCell.titleTextWithSort"
values={
Object {
"ariaSortValue": "none",
"innerText": "Last updated by",
}
}
>
<span
className="euiTableCellContent__text"
title="Last updated by"
>
Last updated by
</span>
</EuiI18n>
</EuiInnerText>
<EuiScreenReaderOnly>
<span
className="euiScreenReaderOnly"
>
<EuiI18n
default="Click to sort in ascending order"
token="euiTableHeaderCell.clickForAscending"
>
Click to sort in ascending order
</EuiI18n>
</span>
</EuiScreenReaderOnly>
</span>
</button>
</th>
</EuiTableHeaderCell>
<EuiTableHeaderCell
align="right"
key="_actions_h_3"
key="_actions_h_2"
width="35px"
>
<th
Expand Down Expand Up @@ -1306,12 +1225,12 @@ exports[`DestinationsList renders 1`] = `
>
<EuiTableRowCell
align="center"
colSpan={4}
colSpan={3}
isMobileFullWidth={true}
>
<td
className="euiTableRowCell euiTableRowCell--isMobileFullWidth"
colSpan={4}
colSpan={3}
style={
Object {
"width": undefined,
Expand Down Expand Up @@ -2156,15 +2075,6 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
"truncateText": true,
"width": "100px",
},
Object {
"field": "user",
"name": "Last updated by",
"render": [Function],
"sortable": true,
"textOnly": true,
"truncateText": true,
"width": "100px",
},
Object {
"actions": Array [
Object {
Expand Down Expand Up @@ -2264,13 +2174,6 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
"name": "Destination type",
"onSort": [Function],
},
Object {
"isSortAscending": undefined,
"isSorted": false,
"key": "_data_s_user_2",
"name": "Last updated by",
"onSort": [Function],
},
]
}
>
Expand Down Expand Up @@ -2549,74 +2452,9 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
</button>
</th>
</EuiTableHeaderCell>
<EuiTableHeaderCell
align="left"
data-test-subj="tableHeaderCell_user_2"
isSorted={false}
key="_data_h_user_2"
onSort={[Function]}
width="100px"
>
<th
aria-live="polite"
aria-sort="none"
className="euiTableHeaderCell"
data-test-subj="tableHeaderCell_user_2"
role="columnheader"
scope="col"
style={
Object {
"width": "100px",
}
}
>
<button
className="euiTableHeaderButton"
data-test-subj="tableHeaderSortButton"
onClick={[Function]}
type="button"
>
<span
className="euiTableCellContent"
>
<EuiInnerText>
<EuiI18n
default="{innerText}; Sorted in {ariaSortValue} order"
token="euiTableHeaderCell.titleTextWithSort"
values={
Object {
"ariaSortValue": "none",
"innerText": "Last updated by",
}
}
>
<span
className="euiTableCellContent__text"
title="Last updated by"
>
Last updated by
</span>
</EuiI18n>
</EuiInnerText>
<EuiScreenReaderOnly>
<span
className="euiScreenReaderOnly"
>
<EuiI18n
default="Click to sort in ascending order"
token="euiTableHeaderCell.clickForAscending"
>
Click to sort in ascending order
</EuiI18n>
</span>
</EuiScreenReaderOnly>
</span>
</button>
</th>
</EuiTableHeaderCell>
<EuiTableHeaderCell
align="right"
key="_actions_h_3"
key="_actions_h_2"
width="35px"
>
<th
Expand Down Expand Up @@ -2654,12 +2492,12 @@ exports[`DestinationsList renders when email is disallowed 1`] = `
>
<EuiTableRowCell
align="center"
colSpan={4}
colSpan={3}
isMobileFullWidth={true}
>
<td
className="euiTableRowCell euiTableRowCell--isMobileFullWidth"
colSpan={4}
colSpan={3}
style={
Object {
"width": undefined,
Expand Down
9 changes: 0 additions & 9 deletions public/pages/Destinations/containers/DestinationsList/utils/constants.js
View file
Open in desktop
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 : '-'),
},
];
14 changes: 0 additions & 14 deletions ...ages/MonitorDetails/components/MonitorOverview/__snapshots__/MonitorOverview.test.js.snap
View file
Open in desktop
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
10 changes: 0 additions & 10 deletions public/pages/MonitorDetails/components/MonitorOverview/utils/getOverviewStats.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,15 +114,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 : '-',
},
];
}
4 changes: 0 additions & 4 deletions public/pages/MonitorDetails/components/MonitorOverview/utils/getOverviewStats.test.js
View file
Open in desktop
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,
},
]);
});
});
9 changes: 0 additions & 9 deletions public/pages/Monitors/containers/Monitors/__snapshots__/Monitors.test.js.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,15 +43,6 @@ exports[`Monitors renders 1`] = `
"truncateText": true,
"width": "150px",
},
Object {
"field": "user",
"name": "Last updated by",
"render": [Function],
"sortable": true,
"textOnly": true,
"truncateText": true,
"width": "100px",
},
Object {
"field": "latestAlert",
"name": "Latest alert",
Expand Down
16 changes: 0 additions & 16 deletions public/pages/Monitors/containers/Monitors/utils/tableUtils.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,22 +25,6 @@ export const columns = [
width: '150px',
render: (name, item) => <EuiLink href={`${PLUGIN_NAME}#/monitors/${item.id}`}>{name}</EuiLink>,
},
{
field: 'user',
name: 'Last updated by',
sortable: true,
truncateText: true,
textOnly: true,
width: '100px',
/* 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
Loading