This is an automated email from the ASF dual-hosted git repository.
pkdotson pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git
The following commit(s) were added to refs/heads/master by this push:
new 6f0d53eed8 feat: add modfied col and timezone info to schedule col
(#20165)
6f0d53eed8 is described below
commit 6f0d53eed8eaf085a6d0a76f68e50c7733754a3d
Author: Phillip Kelley-Dotson <[email protected]>
AuthorDate: Mon Jun 6 09:41:06 2022 -0700
feat: add modfied col and timezone info to schedule col (#20165)
* feat: add modfied and timezone to to schedule col
* test if test works
* udpate test
* fix test
---
.../integration/alerts_and_reports/alerts.test.ts | 3 ++-
.../integration/alerts_and_reports/reports.test.ts | 3 ++-
superset-frontend/src/views/CRUD/alert/AlertList.tsx | 19 ++++++++++++++++---
3 files changed, 20 insertions(+), 5 deletions(-)
diff --git
a/superset-frontend/cypress-base/cypress/integration/alerts_and_reports/alerts.test.ts
b/superset-frontend/cypress-base/cypress/integration/alerts_and_reports/alerts.test.ts
index 0025f4f513..97bf2cc9be 100644
---
a/superset-frontend/cypress-base/cypress/integration/alerts_and_reports/alerts.test.ts
+++
b/superset-frontend/cypress-base/cypress/integration/alerts_and_reports/alerts.test.ts
@@ -38,8 +38,9 @@ describe('alert list view', () => {
cy.get('[data-test="sort-header"]').eq(4).contains('Notification method');
cy.get('[data-test="sort-header"]').eq(5).contains('Created by');
cy.get('[data-test="sort-header"]').eq(6).contains('Owners');
- cy.get('[data-test="sort-header"]').eq(7).contains('Active');
+ cy.get('[data-test="sort-header"]').eq(7).contains('Modified');
// TODO: this assert is flaky, we need to find a way to make it work
consistenly
+ // cy.get('[data-test="sort-header"]').eq(7).contains('Active');
// cy.get('[data-test="sort-header"]').eq(8).contains('Actions');
});
});
diff --git
a/superset-frontend/cypress-base/cypress/integration/alerts_and_reports/reports.test.ts
b/superset-frontend/cypress-base/cypress/integration/alerts_and_reports/reports.test.ts
index a44b389d2e..ea117c507a 100644
---
a/superset-frontend/cypress-base/cypress/integration/alerts_and_reports/reports.test.ts
+++
b/superset-frontend/cypress-base/cypress/integration/alerts_and_reports/reports.test.ts
@@ -38,8 +38,9 @@ describe('report list view', () => {
cy.get('[data-test="sort-header"]').eq(4).contains('Notification method');
cy.get('[data-test="sort-header"]').eq(5).contains('Created by');
cy.get('[data-test="sort-header"]').eq(6).contains('Owners');
- cy.get('[data-test="sort-header"]').eq(7).contains('Active');
+ cy.get('[data-test="sort-header"]').eq(7).contains('Modified');
// TODO: this assert is flaky, we need to find a way to make it work
consistenly
+ // cy.get('[data-test="sort-header"]').eq(7).contains('Active');
// cy.get('[data-test="sort-header"]').eq(8).contains('Actions');
});
});
diff --git a/superset-frontend/src/views/CRUD/alert/AlertList.tsx
b/superset-frontend/src/views/CRUD/alert/AlertList.tsx
index 66fc010923..2f73275704 100644
--- a/superset-frontend/src/views/CRUD/alert/AlertList.tsx
+++ b/superset-frontend/src/views/CRUD/alert/AlertList.tsx
@@ -238,11 +238,14 @@ function AlertList({
size: 'xl',
Cell: ({
row: {
- original: { crontab_humanized = '' },
+ original: { crontab_humanized = '', timezone },
},
}: any) => (
- <Tooltip title={crontab_humanized} placement="topLeft">
- <span>{crontab_humanized}</span>
+ <Tooltip
+ title={`${crontab_humanized} (${timezone})`}
+ placement="topLeft"
+ >
+ <span>{`${crontab_humanized} (${timezone})`}</span>
</Tooltip>
),
},
@@ -283,6 +286,16 @@ function AlertList({
disableSortBy: true,
size: 'xl',
},
+ {
+ Cell: ({
+ row: {
+ original: { changed_on_delta_humanized: changedOn },
+ },
+ }: any) => <span className="no-wrap">{changedOn}</span>,
+ Header: t('Modified'),
+ accessor: 'changed_on_delta_humanized',
+ size: 'xl',
+ },
{
Cell: ({ row: { original } }: any) => (
<Switch
