-
Notifications
You must be signed in to change notification settings - Fork 53
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(ui): display machine notifications on the summary only (#1853)
Move the machine notifications to only display on the summary page and update the component for use with other tabs. Fixes: #1851. Co-authored-by: Caleb Ellis <[email protected]>
- Loading branch information
Showing
7 changed files
with
410 additions
and
320 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
224 changes: 25 additions & 199 deletions
224
ui/src/app/machines/views/MachineDetails/MachineNotifications/MachineNotifications.test.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,213 +1,39 @@ | ||
| import { MemoryRouter, Route } from "react-router-dom"; | ||
| import { mount } from "enzyme"; | ||
| import { Provider } from "react-redux"; | ||
| import configureStore from "redux-mock-store"; | ||
| import React from "react"; | ||
|
|
||
| import { | ||
| architecturesState as architecturesStateFactory, | ||
| generalState as generalStateFactory, | ||
| machine as machineFactory, | ||
| machineEvent as machineEventFactory, | ||
| machineState as machineStateFactory, | ||
| powerType as powerTypeFactory, | ||
| powerTypesState as powerTypesStateFactory, | ||
| rootState as rootStateFactory, | ||
| } from "testing/factories"; | ||
| import MachineNotifications from "./MachineNotifications"; | ||
| import type { RootState } from "app/store/root/types"; | ||
|
|
||
| const mockStore = configureStore(); | ||
|
|
||
| describe("MachineNotifications", () => { | ||
| let state: RootState; | ||
| beforeEach(() => { | ||
| state = rootStateFactory({ | ||
| general: generalStateFactory({ | ||
| architectures: architecturesStateFactory({ | ||
| data: ["amd64"], | ||
| }), | ||
| powerTypes: powerTypesStateFactory({ | ||
| data: [powerTypeFactory()], | ||
| }), | ||
| }), | ||
| machine: machineStateFactory({ | ||
| items: [ | ||
| machineFactory({ | ||
| architecture: "amd64", | ||
| events: [machineEventFactory()], | ||
| system_id: "abc123", | ||
| }), | ||
| ], | ||
| }), | ||
| }); | ||
| }); | ||
|
|
||
| it("handles no notifications", () => { | ||
| const store = mockStore(state); | ||
| it("can render", () => { | ||
| const wrapper = mount( | ||
| <Provider store={store}> | ||
| <MemoryRouter | ||
| initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]} | ||
| > | ||
| <Route | ||
| exact | ||
| path="/machine/:id" | ||
| component={() => <MachineNotifications />} | ||
| /> | ||
| </MemoryRouter> | ||
| </Provider> | ||
| <MachineNotifications | ||
| notifications={[ | ||
| { | ||
| active: true, | ||
| content: | ||
| "Editing is currently disabled because no rack controller is currently connected to the region.", | ||
| status: "Error:", | ||
| type: "negative", | ||
| }, | ||
| ]} | ||
| /> | ||
| ); | ||
| expect(wrapper.find("Notification").exists()).toBe(false); | ||
| expect(wrapper.find("MachineNotifications")).toMatchSnapshot(); | ||
| }); | ||
|
|
||
| it("can display a power error", () => { | ||
| state.machine.items = [ | ||
| machineFactory({ | ||
| architecture: "amd64", | ||
| events: [ | ||
| machineEventFactory({ | ||
| description: "machine timed out", | ||
| }), | ||
| ], | ||
| power_state: "error", | ||
| system_id: "abc123", | ||
| }), | ||
| ]; | ||
| const store = mockStore(state); | ||
| it("ignores inactive notifications", () => { | ||
| const wrapper = mount( | ||
| <Provider store={store}> | ||
| <MemoryRouter | ||
| initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]} | ||
| > | ||
| <Route | ||
| exact | ||
| path="/machine/:id" | ||
| component={() => <MachineNotifications />} | ||
| /> | ||
| </MemoryRouter> | ||
| </Provider> | ||
| <MachineNotifications | ||
| notifications={[ | ||
| { | ||
| active: false, | ||
| content: "Don't show me!", | ||
| status: "Error:", | ||
| type: "negative", | ||
| }, | ||
| ]} | ||
| /> | ||
| ); | ||
| expect( | ||
| wrapper | ||
| .findWhere( | ||
| (n) => | ||
| n.name() === "Notification" && | ||
| n.text().includes("Script - machine timed out") | ||
| ) | ||
| .exists() | ||
| ).toBe(true); | ||
| }); | ||
|
|
||
| it("can display a rack connection error", () => { | ||
| state.general.powerTypes.data = []; | ||
| const store = mockStore(state); | ||
| const wrapper = mount( | ||
| <Provider store={store}> | ||
| <MemoryRouter | ||
| initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]} | ||
| > | ||
| <Route | ||
| exact | ||
| path="/machine/:id" | ||
| component={() => <MachineNotifications />} | ||
| /> | ||
| </MemoryRouter> | ||
| </Provider> | ||
| ); | ||
| expect( | ||
| wrapper | ||
| .findWhere( | ||
| (n) => | ||
| n.name() === "Notification" && | ||
| n.text().includes("no rack controller is currently connected") | ||
| ) | ||
| .exists() | ||
| ).toBe(true); | ||
| }); | ||
|
|
||
| it("can display an architecture error", () => { | ||
| state.machine.items[0].architecture = ""; | ||
| const store = mockStore(state); | ||
| const wrapper = mount( | ||
| <Provider store={store}> | ||
| <MemoryRouter | ||
| initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]} | ||
| > | ||
| <Route | ||
| exact | ||
| path="/machine/:id" | ||
| component={() => <MachineNotifications />} | ||
| /> | ||
| </MemoryRouter> | ||
| </Provider> | ||
| ); | ||
| expect( | ||
| wrapper | ||
| .findWhere( | ||
| (n) => | ||
| n.name() === "Notification" && | ||
| n | ||
| .text() | ||
| .includes("This machine currently has an invalid architecture") | ||
| ) | ||
| .exists() | ||
| ).toBe(true); | ||
| }); | ||
|
|
||
| it("can display a boot images error", () => { | ||
| state.general.architectures = architecturesStateFactory({ | ||
| data: [], | ||
| }); | ||
| const store = mockStore(state); | ||
| const wrapper = mount( | ||
| <Provider store={store}> | ||
| <MemoryRouter | ||
| initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]} | ||
| > | ||
| <Route | ||
| exact | ||
| path="/machine/:id" | ||
| component={() => <MachineNotifications />} | ||
| /> | ||
| </MemoryRouter> | ||
| </Provider> | ||
| ); | ||
| expect( | ||
| wrapper | ||
| .findWhere( | ||
| (n) => | ||
| n.name() === "Notification" && | ||
| n.text().includes("No boot images have been imported") | ||
| ) | ||
| .exists() | ||
| ).toBe(true); | ||
| }); | ||
|
|
||
| it("can display a hardware error", () => { | ||
| state.machine.items[0].cpu_count = 0; | ||
| const store = mockStore(state); | ||
| const wrapper = mount( | ||
| <Provider store={store}> | ||
| <MemoryRouter | ||
| initialEntries={[{ pathname: "/machine/abc123", key: "testKey" }]} | ||
| > | ||
| <Route | ||
| exact | ||
| path="/machine/:id" | ||
| component={() => <MachineNotifications />} | ||
| /> | ||
| </MemoryRouter> | ||
| </Provider> | ||
| ); | ||
| expect( | ||
| wrapper | ||
| .findWhere( | ||
| (n) => | ||
| n.name() === "Notification" && | ||
| n.text().includes("Commission this machine to get CPU") | ||
| ) | ||
| .exists() | ||
| ).toBe(true); | ||
| expect(wrapper.find("Notification").exists()).toBe(false); | ||
| }); | ||
| }); |
Oops, something went wrong.