Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: machine editing details #5072 #5073

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/app/base/components/PageContent/PageContent.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { useSelector } from "react-redux";
import { matchPath, useLocation } from "react-router-dom-v5-compat";

import AppSidePanel from "../AppSidePanel";
import ErrorBoundary from "../ErrorBoundary/ErrorBoundary";
import Footer from "../Footer";
import MainContentSection from "../MainContentSection";
import SecondaryNavigation from "../SecondaryNavigation";
Expand Down Expand Up @@ -75,7 +76,7 @@ const PageContent = ({
isNotificationListHidden={isNotificationListHidden}
{...props}
>
{children}
<ErrorBoundary>{children}</ErrorBoundary>
</MainContentSection>
<hr />
<Footer />
Expand Down
3 changes: 2 additions & 1 deletion src/app/store/machine/reducers.test.ts
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import { produce } from "immer";

import { DEFAULT_STATUSES } from "./constants";
import reducers, {
DEFAULT_COUNT_STATE,
DEFAULT_LIST_STATE,
Expand Down Expand Up @@ -1899,7 +1900,7 @@ describe("machine reducer", () => {
).toEqual(
machineStateFactory({
...initialState,
statuses: { def456: machineStatusFactory() },
statuses: { ...initialState.statuses, abc123: { ...DEFAULT_STATUSES } },
})
);
});
Expand Down
2 changes: 1 addition & 1 deletion src/app/store/machine/slice.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1648,7 +1648,7 @@ const machineSlice = createSlice({
) => {
action.payload.forEach((id) => {
// Clean up the statuses for model.
delete state.statuses[id];
state.statuses[id] = { ...DEFAULT_STATUSES };
});
},
[NodeActions.UNTAG]: generateActionParams<UntagParams>(NodeActions.UNTAG),
Expand Down
Loading