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

Revert "Fleet UI: Reroute homepage (#1640)" (#1724)

Browse source 
Reverts #1640 so that the homepage does not change during the patch release.

This commit will be re-applied after the release is cut.
This commit is contained in:
Zach Wasserman 2021-08-18 18:06:03 -07:00 committed by GitHub
parent e738bae9bb
commit 39cef4c43f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 18 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
changes/1640-reroute-homepage
View file

@ -1 +0,0 @@
* Homepage is now routed to /home instead of hosts/manage

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

@ -19,7 +19,7 @@ describe("Hosts page", () => {
},
},
() => {
cy.visit("/hosts/manage");
cy.visit("/");
cy.contains("button", /add new host/i).click();
@ -40,7 +40,7 @@ describe("Hosts page", () => {
// testing, but may vary by environment).
cy.waitUntil(
() => {
cy.visit("/hosts/manage");
cy.visit("/");
return Cypress.$('button[title="Online"]').length > 0;
},
{ timeout: 30000, interval: 1000 }

4
cypress/integration/all/sessions/sessions.spec.ts
View file

@ -15,8 +15,8 @@ describe("Sessions", () => {
cy.get("button").click();
// Verify dashboard
cy.url().should("include", "/home");
cy.contains("Hosts");
cy.url().should("include", "/hosts/manage");
cy.contains("All Hosts");
// Log out
cy.findByAltText(/user avatar/i).click();

4
cypress/integration/all/sessions/sso.spec.ts
View file

@ -17,8 +17,8 @@ describe("SSO Sessions", () => {
cy.contains("button", "Login").click();
// Verify dashboard
cy.url().should("include", "/home");
cy.contains("Hosts");
cy.url().should("include", "/hosts/manage");
cy.contains("All Hosts");
// Log out
cy.findByAltText(/user avatar/i).click();

2
cypress/integration/basic/admin.spec.ts
View file

@ -14,7 +14,7 @@ describe("Basic tier - Admin user", () => {
it("Can perform the appropriate basic-tier admin actions", () => {
cy.login("anna@organization.com", "user123#");
cy.visit("/hosts/manage");
cy.visit("/");
// Ensure the hosts page is loaded
cy.contains("All hosts");

2
cypress/integration/basic/maintainer.spec.ts
View file

@ -14,7 +14,7 @@ describe("Basic tier - Maintainer user", () => {
it("Can perform the appropriate basic global maintainer actions", () => {
cy.login("mary@organization.com", "user123#");
cy.visit("/hosts/manage");
cy.visit("/");
// Ensure page is loaded
cy.contains("All hosts");

4
cypress/integration/basic/observer.spec.ts
View file

@ -14,7 +14,7 @@ describe("Basic tier - Observer user", () => {
it("Can perform the appropriate basic global observer actions", () => {
cy.login("oliver@organization.com", "user123#");
cy.visit("/hosts/manage");
cy.visit("/");
// Ensure page is loaded
cy.contains("All hosts");
@ -67,8 +67,6 @@ describe("Basic tier - Observer user", () => {
cy.visit("/schedule/manage");
cy.findByText(/you do not have permissions/i).should("exist");
cy.visit("/hosts/manage");
cy.contains(".table-container .data-table__table th", "Team").should(
"be.visible"
);

4
cypress/integration/basic/team_maintainer_observer.spec.ts
View file

@ -13,7 +13,7 @@ describe("Basic tier - Team observer/maintainer user", () => {
it("Can perform the appropriate team observer actions", () => {
cy.login("marco@organization.com", "user123#");
cy.visit("/hosts/manage");
cy.visit("/");
// Ensure page is loaded
cy.contains("Hosts");
@ -107,7 +107,7 @@ describe("Basic tier - Team observer/maintainer user", () => {
it("Can perform the appropriate maintainer actions", () => {
cy.login("marco@organization.com", "user123#");
cy.visit("/hosts/manage");
cy.visit("/");
// Ensure page is loaded and appropriate nav links are displayed
cy.contains("Hosts");

2
cypress/integration/core/admin.spec.ts
View file

@ -14,7 +14,7 @@ describe("Core tier - Admin user", () => {
it("Can perform the appropriate core-tier admin actions", () => {
cy.login("anna@organization.com", "user123#");
cy.visit("/hosts/manage");
cy.visit("/");
// Ensure page is loaded
cy.contains("All hosts");

2
cypress/integration/core/maintainer.spec.ts
View file

@ -14,7 +14,7 @@ describe("Core tier - Maintainer user", () => {
it("Can perform the appropriate core global maintainer actions", () => {
cy.login("mary@organization.com", "user123#");
cy.visit("/hosts/manage");
cy.visit("/");
// Ensure page is loaded
cy.contains("All hosts");

2
cypress/integration/core/observer.spec.ts
View file

@ -14,7 +14,7 @@ describe("Core tier - Observer user", () => {
it("Can perform the appropriate core global observer actions", () => {
cy.login("oliver@organization.com", "user123#");
cy.visit("/hosts/manage");
cy.visit("/");
// Ensure page is loaded
cy.contains("All hosts");

2
frontend/components/side_panels/SiteTopNav/navItems.js
View file

@ -21,7 +21,7 @@ export default (currentUser) => {
name: "Home",
iconName: "logo",
location: {
regex: new RegExp(`^${URL_PREFIX}/home`),
regex: new RegExp(`^${URL_PREFIX}/home/dashboard`),
pathname: PATHS.HOMEPAGE,
},
},

4
frontend/router/index.jsx
View file

@ -69,8 +69,8 @@ const routes = (
<Route path="email/change/:token" component={EmailTokenRedirect} />
<Route path="logout" component={LogoutPage} />
<Route component={CoreLayout}>
<IndexRedirect to={PATHS.HOMEPAGE} />
<Route path="home" component={Homepage} />
<IndexRedirect to={PATHS.MANAGE_HOSTS} />
<Route path="home/dashboard" component={Homepage} />
<Route path="settings" component={AuthenticatedAdminRoutes}>
<Route component={SettingsWrapper}>
<Route path="organization" component={AdminAppSettingsPage} />

2
frontend/router/paths.ts
View file

@ -23,7 +23,7 @@ export default {
FLEET_403: `${URL_PREFIX}/403`,
FLEET_500: `${URL_PREFIX}/500`,
LOGIN: `${URL_PREFIX}/login`,
HOMEPAGE: `${URL_PREFIX}/home`,
HOMEPAGE: `${URL_PREFIX}/home/dashboard`,
LOGOUT: `${URL_PREFIX}/logout`,
MANAGE_HOSTS: `${URL_PREFIX}/hosts/manage`,
HOST_DETAILS: (host: IHost): string => {