diff --git a/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx b/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx index e8a01a5f6b..ce900b4cb8 100644 --- a/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx +++ b/superset-frontend/src/views/CRUD/alert/AlertReportModal.tsx @@ -33,6 +33,8 @@ import Owner from 'src/types/Owner'; import { AlertReportCronScheduler } from './components/AlertReportCronScheduler'; import { AlertObject, Operator, Recipient, MetaObject } from './types'; +const SELECT_PAGE_SIZE = 2000; // temporary fix for paginated query + type SelectValue = { value: string; label: string; @@ -616,7 +618,7 @@ const AlertReportModal: FunctionComponent = ({ // Fetch data to populate form dropdowns const loadOwnerOptions = (input = '') => { - const query = rison.encode({ filter: input }); + const query = rison.encode({ filter: input, page_size: SELECT_PAGE_SIZE }); return SupersetClient.get({ endpoint: `/api/v1/report/related/owners?q=${query}`, }).then( @@ -633,7 +635,7 @@ const AlertReportModal: FunctionComponent = ({ }; const loadSourceOptions = (input = '') => { - const query = rison.encode({ filter: input }); + const query = rison.encode({ filter: input, page_size: SELECT_PAGE_SIZE }); return SupersetClient.get({ endpoint: `/api/v1/report/related/database?q=${query}`, }).then( @@ -682,7 +684,7 @@ const AlertReportModal: FunctionComponent = ({ }; const loadDashboardOptions = (input = '') => { - const query = rison.encode({ filter: input }); + const query = rison.encode({ filter: input, page_size: SELECT_PAGE_SIZE }); return SupersetClient.get({ endpoint: `/api/v1/report/related/dashboard?q=${query}`, }).then( @@ -731,7 +733,7 @@ const AlertReportModal: FunctionComponent = ({ }; const loadChartOptions = (input = '') => { - const query = rison.encode({ filter: input }); + const query = rison.encode({ filter: input, page_size: SELECT_PAGE_SIZE }); return SupersetClient.get({ endpoint: `/api/v1/report/related/chart?q=${query}`, }).then( diff --git a/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx b/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx index 5806255ba4..8baaaba268 100644 --- a/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx +++ b/superset-frontend/src/views/CRUD/alert/ExecutionLog.tsx @@ -104,7 +104,7 @@ function ExecutionLog({ addDangerToast, isReportEnabled }: ExecutionLogProps) { row: { original: { start_dttm: startDttm }, }, - }: any) => moment(new Date(startDttm)).format('ll'), + }: any) => moment(new Date(startDttm)).format('MM/DD/YYYY hh:mm:ss a'), Header: t('Start At'), accessor: 'start_dttm', },