diff --git a/packages/web_ui/src/bootstrap.jsx b/packages/web_ui/src/bootstrap.jsx index 2de400dc..54bd091e 100644 --- a/packages/web_ui/src/bootstrap.jsx +++ b/packages/web_ui/src/bootstrap.jsx @@ -90,5 +90,5 @@ export default async function bootstrap() { controlConnector.setTimeout(15); let control = new Control(controlConnector, plugins); - ReactDOM.render(, document.getElementById("root")); + ReactDOM.render(, document.getElementById("root")); } diff --git a/packages/web_ui/src/components/App.jsx b/packages/web_ui/src/components/App.jsx index 085618d1..dd36eac4 100644 --- a/packages/web_ui/src/components/App.jsx +++ b/packages/web_ui/src/components/App.jsx @@ -7,7 +7,6 @@ import { logger } from "@clusterio/lib/logging"; import ErrorBoundary from "./ErrorBoundary"; import SiteLayout from "./SiteLayout"; import ControlContext from "./ControlContext"; -import PluginsContext from "./PluginsContext"; import LoginForm from "./LoginForm"; import { Card, Spin, Typography } from "antd"; @@ -95,11 +94,9 @@ export default function App(props) { return ( - - - {page} - - + + {page} + ); diff --git a/packages/web_ui/src/components/LoginForm.jsx b/packages/web_ui/src/components/LoginForm.jsx index 7e78b915..e44f2ecf 100644 --- a/packages/web_ui/src/components/LoginForm.jsx +++ b/packages/web_ui/src/components/LoginForm.jsx @@ -3,7 +3,7 @@ import { Button, Card, Divider, Form, Image, Input, List, Space, Spin, Typograph import LockOutlined from "@ant-design/icons/LockOutlined"; import logo from "../images/logo.png"; -import PluginsContext from "./PluginsContext"; +import ControlContext from "./ControlContext"; const { Paragraph, Text } = Typography; @@ -33,7 +33,7 @@ function TokenAuth(props) { } export default function LoginForm(props) { - let plugins = useContext(PluginsContext); + let plugins = useContext(ControlContext).plugins; let loginForms = []; for (let plugin of plugins.values()) { diff --git a/packages/web_ui/src/components/PluginViewPage.jsx b/packages/web_ui/src/components/PluginViewPage.jsx index 4ab2955f..f6ef29de 100644 --- a/packages/web_ui/src/components/PluginViewPage.jsx +++ b/packages/web_ui/src/components/PluginViewPage.jsx @@ -2,14 +2,14 @@ import React, { useEffect, useContext, useState } from "react"; import { useHistory, useParams } from "react-router-dom"; import { Alert, Descriptions, Spin } from "antd"; -import PluginsContext from "./PluginsContext"; +import ControlContext from "./ControlContext"; import PageLayout from "./PageLayout"; import { notifyErrorHandler } from "../util/notify"; export default function PluginViewPage() { let params = useParams(); - let plugins = useContext(PluginsContext); + let plugins = useContext(ControlContext).plugins; let [pluginList, setPluginList] = useState(null); let pluginName = params.name; diff --git a/packages/web_ui/src/components/PluginsPage.jsx b/packages/web_ui/src/components/PluginsPage.jsx index 6c9390f2..e93483bc 100644 --- a/packages/web_ui/src/components/PluginsPage.jsx +++ b/packages/web_ui/src/components/PluginsPage.jsx @@ -3,12 +3,12 @@ import { useHistory } from "react-router-dom"; import { Table } from "antd"; import notify from "../util/notify"; -import PluginsContext from "./PluginsContext"; +import ControlContext from "./ControlContext"; import PageLayout from "./PageLayout"; export default function PluginsPage() { - let plugins = useContext(PluginsContext); + let plugins = useContext(ControlContext).plugins; let history = useHistory(); let [pluginList, setPluginList] = useState([]); diff --git a/packages/web_ui/src/components/SiteLayout.jsx b/packages/web_ui/src/components/SiteLayout.jsx index eded71c2..843d3e6b 100644 --- a/packages/web_ui/src/components/SiteLayout.jsx +++ b/packages/web_ui/src/components/SiteLayout.jsx @@ -7,7 +7,7 @@ import webUiPackage from "../../package.json"; import { useAccount } from "../model/account"; import ErrorBoundary from "./ErrorBoundary"; import ErrorPage from "./ErrorPage"; -import PluginsContext from "./PluginsContext"; +import ControlContext from "./ControlContext"; import { pages } from "../pages"; const { Header, Sider } = Layout; @@ -17,7 +17,7 @@ export default function SiteLayout(props) { let history = useHistory(); let [currentSidebarPath, setCurrentSidebarPath] = useState(null); let account = useAccount(); - let plugins = useContext(PluginsContext); + let plugins = useContext(ControlContext).plugins; function SetSidebar(setSidebarProps) { useEffect(() => { diff --git a/packages/web_ui/src/index.jsx b/packages/web_ui/src/index.jsx index b411ddc0..2f783d08 100644 --- a/packages/web_ui/src/index.jsx +++ b/packages/web_ui/src/index.jsx @@ -8,7 +8,6 @@ export * from "./model/item_metadata.jsx"; export { default as ControlContext } from "./components/ControlContext"; -export { default as PluginsContext } from "./components/PluginsContext"; export { default as BaseConfigTree } from "./components/BaseConfigTree"; export { default as InstanceConfigTree } from "./components/InstanceConfigTree";