diff --git a/changes/1919-use-query-name-scheduled-queries b/changes/1919-use-query-name-scheduled-queries new file mode 100644 index 0000000000..d27154f82b --- /dev/null +++ b/changes/1919-use-query-name-scheduled-queries @@ -0,0 +1 @@ +Display `query_name` in reference to `scheduled_queries` for more consistent UI/UX \ No newline at end of file diff --git a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesList.jsx b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesList.jsx index 54dd3436a1..5498bb4685 100644 --- a/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesList.jsx +++ b/frontend/components/queries/ScheduledQueriesList/ScheduledQueriesList.jsx @@ -179,7 +179,7 @@ class ScheduledQueriesList extends Component { {renderHelpText()} {!!scheduledQueries.length && - sortBy(scheduledQueries, ["name"]).map((scheduledQuery) => { + sortBy(scheduledQueries, ["query_name"]).map((scheduledQuery) => { return ( { title: "Query name", Header: "Query name", disableSortBy: true, - accessor: "scheduled_query_name", + accessor: "query_name", Cell: (cellProps) => , }, { diff --git a/frontend/pages/packs/EditPackPage/EditPackPage.jsx b/frontend/pages/packs/EditPackPage/EditPackPage.jsx index 90d8fc5154..c71fe0aef6 100644 --- a/frontend/pages/packs/EditPackPage/EditPackPage.jsx +++ b/frontend/pages/packs/EditPackPage/EditPackPage.jsx @@ -66,12 +66,11 @@ export class EditPackPage extends Component { packID, packLabels, packTeams, - scheduledQueries, } = this.props; const { load } = packActions; const { loadAll } = queryActions; - if (!pack && !isLoadingPack) { + if (!isLoadingPack) { dispatch(load(packID)); } @@ -89,9 +88,7 @@ export class EditPackPage extends Component { } } - if (!size(scheduledQueries)) { - dispatch(scheduledQueryActions.loadAll({ id: packID })); - } + dispatch(scheduledQueryActions.loadAll({ id: packID })); if (!size(allQueries)) { dispatch(loadAll()); diff --git a/frontend/pages/schedule/ManageSchedulePage/components/ScheduleListWrapper/ScheduleTableConfig.tsx b/frontend/pages/schedule/ManageSchedulePage/components/ScheduleListWrapper/ScheduleTableConfig.tsx index 75bb5ccf0e..17d0373184 100644 --- a/frontend/pages/schedule/ManageSchedulePage/components/ScheduleListWrapper/ScheduleTableConfig.tsx +++ b/frontend/pages/schedule/ManageSchedulePage/components/ScheduleListWrapper/ScheduleTableConfig.tsx @@ -83,7 +83,7 @@ const generateTableHeaders = ( title: "Query", Header: "Query", disableSortBy: true, - accessor: "name", + accessor: "query_name", Cell: (cellProps: ICellProps): JSX.Element => ( ), @@ -139,6 +139,7 @@ const enhanceAllScheduledQueryData = ( (all_scheduled_query: IGlobalScheduledQuery | ITeamScheduledQuery) => { return { name: all_scheduled_query.name, + query_name: all_scheduled_query.query_name, interval: all_scheduled_query.interval, actions: generateActionDropdownOptions(), id: all_scheduled_query.id,