Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-24 01:18:42 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 59

Conform usage of query names for scheduled queries (#1924)

Browse source
This commit is contained in:
gillespi314 2021-09-03 10:57:25 -05:00 committed by GitHub
parent 0cb2f21233
commit 5c707ae21f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes/1919-use-query-name-scheduled-queries Normal file
View file

@ -0,0 +1 @@
Display `query_name` in reference to `scheduled_queries` for more consistent UI/UX

2
frontend/components/queries/ScheduledQueriesList/ScheduledQueriesList.jsx
View file

@ -179,7 +179,7 @@ class ScheduledQueriesList extends Component {
<tbody>
{renderHelpText()}
{!!scheduledQueries.length &&
sortBy(scheduledQueries, ["name"]).map((scheduledQuery) => {
sortBy(scheduledQueries, ["query_name"]).map((scheduledQuery) => {
return (
<QueriesListItem
checked={this.isChecked(scheduledQuery)}

2
frontend/pages/hosts/HostDetailsPage/PackTable/PackTableConfig.tsx
View file

@ -67,7 +67,7 @@ const generatePackTableHeaders = (): IDataColumn[] => {
title: "Query name",
Header: "Query name",
disableSortBy: true,
accessor: "scheduled_query_name",
accessor: "query_name",
Cell: (cellProps) => <TextCell value={cellProps.cell.value} />,
},
{

7
frontend/pages/packs/EditPackPage/EditPackPage.jsx
View file

@ -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());

3
frontend/pages/schedule/ManageSchedulePage/components/ScheduleListWrapper/ScheduleTableConfig.tsx
View file

@ -83,7 +83,7 @@ const generateTableHeaders = (
title: "Query",
Header: "Query",
disableSortBy: true,
accessor: "name",
accessor: "query_name",
Cell: (cellProps: ICellProps): JSX.Element => (
<TextCell value={cellProps.cell.value} />
),
@ -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,