Elgato_dark/fleet
1
0
Fork 0
mirror of https://github.com/fleetdm/fleet synced 2026-05-23 00:49:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 106

Bug Fixes: sortBy key and e2e hosts.spec.ts (#2506)

Browse source
This commit is contained in:
RachelElysia 2021-10-13 14:12:44 -04:00 committed by GitHub
parent 0510075398
commit de1e73b5b4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
cypress/integration/all/app/hosts.spec.ts
View file

@ -61,12 +61,9 @@ describe(
// Go to host details page
cy.get('button[title="Online"]').click();
cy.waitUntil(
() => {
return cy.get("span.status").contains(/online/i);
},
{ timeout: 30000, interval: 1000 }
);
cy.wait(3000); // eslint-disable-line cypress/no-unnecessary-waiting
cy.get(".status").contains(/online/i);
}
);

3
cypress/integration/all/app/labelflow.spec.ts
View file

@ -65,8 +65,7 @@ describe(
// delete custom label
cy.get(".manage-hosts__label-block button").last().click();
// Can't figure out how attach findByRole onto modal button
// Can't use findByText because delete button under modal
cy.wait(2000); // eslint-disable-line cypress/no-unnecessary-waiting
cy.get(".manage-hosts__modal-buttons > .button--alert")
.contains("button", /delete/i)
.click();

5
frontend/pages/hosts/ManageHostsPage/ManageHostsPage.tsx
View file

@ -332,8 +332,11 @@ const ManageHostsPage = ({
}
};
const refetchHosts = (options: IHostCountLoadOptions) => {
const refetchHosts = (options: IHostLoadOptions) => {
retrieveHosts(options);
if (options.sortBy) {
delete options.sortBy;
}
retrieveHostCount(options);
};

4
frontend/services/entities/host_count.ts
View file

@ -10,12 +10,12 @@ export interface ISortOption {
export interface IHostCountLoadOptions {
page?: number;
perPage?: number;
status?: string;
selectedLabels?: string[];
globalFilter?: string;
status?: string;
teamId?: number;
policyId?: number;
policyResponse?: string;
selectedLabels?: string[];
}
export default {