Update UI for Notifications Integration (#126)

Update reporting front-end for Notifications integration Signed-off-by: David Cui <davidcui@amazon.com>
opensearch-project · Jul 19, 2021 · a031386 · a031386
1 parent ea5dc61
commit a031386
Show file tree

Hide file tree

Showing 33 changed files with 2,311 additions and 3,106 deletions.
diff --git a/dashboards-reports/.cypress/integration/02-edit.spec.ts b/dashboards-reports/.cypress/integration/02-edit.spec.ts
@@ -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',
@@ -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',
@@ -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');
   });
 });
diff --git a/dashboards-reports/public/components/main/main_utils.tsx b/dashboards-reports/public/components/main/main_utils.tsx
@@ -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()
@@ -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];
@@ -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);
 };
 
@@ -153,7 +170,7 @@ export const readStreamToFile = async (
 };
 
 export const generateReportFromDefinitionId = async (
-  reportDefinitionId,
+  reportDefinitionId: string,
   httpClient: HttpSetup
 ) => {
   let status = false;
@@ -188,7 +205,7 @@ export const generateReportFromDefinitionId = async (
 };
 
 export const generateReportById = async (
-  reportId,
+  reportId: string,
   httpClient: HttpSetup,
   handleSuccessToast,
   handleErrorToast,