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

Jump to bottom

Update UI for Notifications Integration #126

Merged
merged 16 commits into from
Jul 19, 2021
Merged

Update UI for Notifications Integration #126

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
8edbca4
update notification settings in details pages, left commented out unt…
davidcui1225 Jun 17, 2021
d64e765
save progress on front-end changes
davidcui1225 Jul 10, 2021
a36eb5e
Merge remote-tracking branch 'origin/main' into update-ui-for-notific…
davidcui1225 Jul 11, 2021
95ed1c4
merge from old changes, fix branch
davidcui1225 Jul 11, 2021
b1cf632
update UI for notifications integration and update test cases
davidcui1225 Jul 14, 2021
f33fcfa
remove cypress mp4s from PR
davidcui1225 Jul 14, 2021
346cd15
remove commented-out code for old report trigger section
davidcui1225 Jul 14, 2021
80c4e34
Merge remote-tracking branch 'origin/main' into update-ui-for-notific…
davidcui1225 Jul 14, 2021
4d90df5
update report definition body
davidcui1225 Jul 14, 2021
09c549f
changed notifications subject placeholder to generic message for now
davidcui1225 Jul 15, 2021
01c5eb2
fixed multiple issues and updated tests
davidcui1225 Jul 16, 2021
711c858
remove remaining reference to ChannelIds vs configIds
davidcui1225 Jul 16, 2021
65fd6dc
addressed comments: correct types on handlers, corrected configId typ…
davidcui1225 Jul 16, 2021
3e8ad3a
update polish translation for error message, specify more types for p…
davidcui1225 Jul 16, 2021
4adf3f8
remove commented out code
davidcui1225 Jul 16, 2021
0fac9cc
add todo for delivery configuratio ncheck
davidcui1225 Jul 19, 2021
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
23 changes: 19 additions & 4 deletions dashboards-reports/.cypress/integration/02-edit.spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,14 @@ describe('Cypress', () => {
cy.get('#reportSettingsDescription').type(' update description');

cy.get('#editReportDefinitionButton').click({ force: true });

cy.wait(12500);

// check that re-direct to home page
cy.get('#reportDefinitionDetailsLink').should('exist');
});

it('Visit edit page, change report source and trigger', () => {
it('Visit edit page, change report trigger', () => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/reports-dashboards#/`);
cy.location('pathname', { timeout: 60000 }).should(
'include',
Expand All @@ -71,13 +76,18 @@ describe('Cypress', () => {
cy.url().should('include', 'edit');

cy.wait(1000);
cy.get('#visualizationReportSource').check({ force: true });
cy.get('#reportDefinitionTriggerTypes > div:nth-child(2)').click({ force: true });

cy.get('#Schedule').check({ force: true });
cy.get('#editReportDefinitionButton').click({ force: true });

cy.wait(12500);

// check that re-direct to home page
cy.get('#reportDefinitionDetailsLink').should('exist');
});

it('Visit edit page, change report source back', () => {
it('Visit edit page, change report trigger back', () => {
cy.visit(`${Cypress.env('opensearchDashboards')}/app/reports-dashboards#/`);
cy.location('pathname', { timeout: 60000 }).should(
'include',
Expand All @@ -96,8 +106,13 @@ describe('Cypress', () => {

cy.wait(1000);

cy.get('#dashboardReportSource').check({ force: true });
cy.get('#reportDefinitionTriggerTypes > div:nth-child(1)').click({ force: true });

cy.get('#editReportDefinitionButton').click({ force: true });

cy.wait(12500);

// check that re-direct to home page
cy.get('#reportDefinitionDetailsLink').should('exist');
});
});
29 changes: 23 additions & 6 deletions dashboards-reports/public/components/main/main_utils.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,14 +27,31 @@
import 'babel-polyfill';
import { i18n } from '@osd/i18n';
import { HttpFetchOptions, HttpSetup } from '../../../../../src/core/public';
import { placeholderChannels } from '../report_definitions/delivery/delivery_constants';

export const fileFormatsUpper = {
export const displayDeliveryChannels = (configIds: Array<string>) => {
let displayChannels = [];
for (let i = 0; i < configIds.length; ++i) {
for (let j = 0; j < placeholderChannels.length; ++j) {
if (configIds[i] === placeholderChannels[j].id) {
displayChannels.push(placeholderChannels[i].label);
}
}
}
return displayChannels.toString();
}

type fileFormatsOptions = {
[key: string]: string
}

export const fileFormatsUpper: fileFormatsOptions = {
csv: 'CSV',
pdf: 'PDF',
png: 'PNG',
};

export const humanReadableDate = (date) => {
export const humanReadableDate = (date: string | number | Date) => {
let readableDate = new Date(date);
return (
readableDate.toDateString() + ' @ ' + readableDate.toLocaleTimeString()
Expand All @@ -55,7 +72,7 @@ export const getFileFormatPrefix = (fileFormat: string) => {
return fileFormatPrefix;
};

export const addReportsTableContent = (data) => {
export const addReportsTableContent = (data: string | any[]) => {
let reportsTableItems = [];
for (let index = 0; index < data.length; ++index) {
let item = data[index];
Expand Down Expand Up @@ -110,7 +127,7 @@ export const addReportDefinitionsTableContent = (data: any) => {
return reportDefinitionsTableItems;
};

export const removeDuplicatePdfFileFormat = (filename) => {
export const removeDuplicatePdfFileFormat = (filename: string) => {
return filename.substring(0, filename.length - 4);
};

Expand Down Expand Up @@ -153,7 +170,7 @@ export const readStreamToFile = async (
};

export const generateReportFromDefinitionId = async (
reportDefinitionId,
reportDefinitionId: string,
httpClient: HttpSetup
) => {
let status = false;
Expand Down Expand Up @@ -188,7 +205,7 @@ export const generateReportFromDefinitionId = async (
};

export const generateReportById = async (
reportId,
reportId: string,
httpClient: HttpSetup,
handleSuccessToast,
handleErrorToast,
Expand Down
Loading