mirror of
https://github.com/clusterio/clusterio.git
synced 2026-11-22 08:13:12 +09:00
Disable options if a system doesn't support it
This commit is contained in:
5 files changed
+67
-11
No files matched your search
@@ -1075,7 +1075,13 @@ export default class ControlConnection extends BaseConnection {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async handlePluginListRequest(request: lib.PluginListRequest) {
|
async handlePluginListRequest(request: lib.PluginListRequest) {
|
||||||
return this._controller.pluginInfos.map(pluginInfo => lib.PluginDetails.fromNodeEnvInfo(pluginInfo));
|
return this._controller.pluginInfos.map(pluginInfo => lib.PluginDetails.fromNodeEnvInfo(
|
||||||
|
pluginInfo,
|
||||||
|
this._controller.plugins.has(pluginInfo.name),
|
||||||
|
this._controller.config.get(
|
||||||
|
`${pluginInfo.name}.load_plugin` as keyof lib.ControllerConfigFields
|
||||||
|
) as boolean,
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
async handleDebugDumpWsRequest(request: lib.DebugDumpWsRequest) {
|
async handleDebugDumpWsRequest(request: lib.DebugDumpWsRequest) {
|
||||||
|
|||||||
@@ -537,7 +537,7 @@ hostPluginCommands.add(new lib.Command({
|
|||||||
let hostId = await lib.resolveHost(control, args.host);
|
let hostId = await lib.resolveHost(control, args.host);
|
||||||
const plugins = await control.sendTo({ hostId }, new lib.PluginListRequest());
|
const plugins = await control.sendTo({ hostId }, new lib.PluginListRequest());
|
||||||
print(asTable(plugins.map(p => ({
|
print(asTable(plugins.map(p => ({
|
||||||
title: p.title, version: p.version, npmPackage: p.npmPackage,
|
title: p.title, version: p.version, loaded: p.loaded, enabled: p.enabled, npmPackage: p.npmPackage,
|
||||||
}))));
|
}))));
|
||||||
},
|
},
|
||||||
}));
|
}));
|
||||||
|
|||||||
@@ -1071,7 +1071,11 @@ export default class Host extends lib.Link {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async handlePluginListRequest(request: lib.PluginListRequest) {
|
async handlePluginListRequest(request: lib.PluginListRequest) {
|
||||||
return this.pluginInfos.map(pluginInfo => lib.PluginDetails.fromNodeEnvInfo(pluginInfo));
|
return this.pluginInfos.map(pluginInfo => lib.PluginDetails.fromNodeEnvInfo(
|
||||||
|
pluginInfo,
|
||||||
|
this.plugins.has(pluginInfo.name),
|
||||||
|
this.config.get(`${pluginInfo.name}.load_plugin` as keyof lib.HostConfigFields) as boolean,
|
||||||
|
));
|
||||||
}
|
}
|
||||||
|
|
||||||
sendHostUpdate() {
|
sendHostUpdate() {
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ export class PluginDetails {
|
|||||||
public name: string,
|
public name: string,
|
||||||
public title: string,
|
public title: string,
|
||||||
public version: string,
|
public version: string,
|
||||||
|
public loaded: boolean,
|
||||||
|
public enabled: boolean,
|
||||||
public description?: string,
|
public description?: string,
|
||||||
public npmPackage?: string,
|
public npmPackage?: string,
|
||||||
) {}
|
) {}
|
||||||
@@ -16,19 +18,23 @@ export class PluginDetails {
|
|||||||
name: Type.String(),
|
name: Type.String(),
|
||||||
title: Type.String(),
|
title: Type.String(),
|
||||||
version: Type.String(),
|
version: Type.String(),
|
||||||
|
loaded: Type.Boolean(),
|
||||||
|
enabled: Type.Boolean(),
|
||||||
description: Type.Optional(Type.String()),
|
description: Type.Optional(Type.String()),
|
||||||
npmPackage: Type.Optional(Type.String()),
|
npmPackage: Type.Optional(Type.String()),
|
||||||
});
|
});
|
||||||
|
|
||||||
static fromJSON(json: Static<typeof this.jsonSchema>) {
|
static fromJSON(json: Static<typeof this.jsonSchema>) {
|
||||||
return new this(json.name, json.title, json.version, json.description, json.npmPackage);
|
return new this(
|
||||||
|
json.name, json.title, json.version, json.loaded, json.enabled,
|
||||||
|
json.description, json.npmPackage
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
static fromNodeEnvInfo(pluginInfo: PluginNodeEnvInfo) {
|
static fromNodeEnvInfo(pluginInfo: PluginNodeEnvInfo, loaded: boolean, enabled: boolean) {
|
||||||
return new this(
|
return new this(
|
||||||
pluginInfo.name, pluginInfo.title,
|
pluginInfo.name, pluginInfo.title, pluginInfo.version, loaded, enabled,
|
||||||
pluginInfo.version, pluginInfo.description,
|
pluginInfo.description, pluginInfo.npmPackage,
|
||||||
pluginInfo.npmPackage,
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -89,6 +89,40 @@ export function NpmButton(props: { target: lib.AddressShorthand, canRestart?: bo
|
|||||||
const [formAction, setFormAction] = useState<string | undefined>(undefined);
|
const [formAction, setFormAction] = useState<string | undefined>(undefined);
|
||||||
const [form] = Form.useForm();
|
const [form] = Form.useForm();
|
||||||
|
|
||||||
|
const [allows, setAllows] = useState({
|
||||||
|
remoteUpdates: true, pluginUpdates: true, pluginInstall: true,
|
||||||
|
});
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (props.target === "controller") {
|
||||||
|
if (!account.hasPermission("core.controller.get_config")) {
|
||||||
|
setAllows({ remoteUpdates: true, pluginUpdates: true, pluginInstall: true });
|
||||||
|
return; // If a user doesn't have config perms, then assume true to allow the sending the request
|
||||||
|
}
|
||||||
|
control.send(new lib.ControllerConfigGetRequest()).then(async (serializedConfig) => {
|
||||||
|
const config = lib.ControllerConfig.fromJSON(serializedConfig, "control");
|
||||||
|
setAllows({
|
||||||
|
remoteUpdates: config.get("controller.allow_remote_updates"),
|
||||||
|
pluginUpdates: config.get("controller.allow_plugin_updates"),
|
||||||
|
pluginInstall: config.get("controller.allow_plugin_install"),
|
||||||
|
});
|
||||||
|
}).catch(notifyErrorHandler("Failed to fetch controller config for remote updates"));
|
||||||
|
} else {
|
||||||
|
if (!account.hasPermission("core.host.get_config")) {
|
||||||
|
setAllows({ remoteUpdates: true, pluginUpdates: true, pluginInstall: true });
|
||||||
|
return; // If a user doesn't have config perms, then assume true to allow the sending the request
|
||||||
|
}
|
||||||
|
control.sendTo(props.target, new lib.HostConfigGetRequest()).then(async (serializedConfig) => {
|
||||||
|
const config = lib.HostConfig.fromJSON(serializedConfig, "control");
|
||||||
|
setAllows({
|
||||||
|
remoteUpdates: config.get("host.allow_remote_updates"),
|
||||||
|
pluginUpdates: config.get("host.allow_plugin_updates"),
|
||||||
|
pluginInstall: config.get("host.allow_plugin_install"),
|
||||||
|
});
|
||||||
|
}).catch(notifyErrorHandler("Failed to fetch host config for remote updates"));
|
||||||
|
}
|
||||||
|
}, [props.target]);
|
||||||
|
|
||||||
function onValuesChange({ action } : { action?: string }) {
|
function onValuesChange({ action } : { action?: string }) {
|
||||||
if (action) {
|
if (action) {
|
||||||
setFormAction(action);
|
setFormAction(action);
|
||||||
@@ -138,11 +172,17 @@ export function NpmButton(props: { target: lib.AddressShorthand, canRestart?: bo
|
|||||||
<Form.Item label="Action" name="action">
|
<Form.Item label="Action" name="action">
|
||||||
<Radio.Group value={formAction}>
|
<Radio.Group value={formAction}>
|
||||||
{account.hasPermission(`core.${props.target === "controller" ? "controller" : "host"}.update`)
|
{account.hasPermission(`core.${props.target === "controller" ? "controller" : "host"}.update`)
|
||||||
? <Radio.Button value="remote_update">Update Clusterio</Radio.Button> : undefined}
|
? <Radio.Button value="remote_update" disabled={!allows.remoteUpdates}>
|
||||||
|
Update Clusterio
|
||||||
|
</Radio.Button>: undefined}
|
||||||
{account.hasPermission("core.plugin.update")
|
{account.hasPermission("core.plugin.update")
|
||||||
? <Radio.Button value="plugin_update">Update Plugin</Radio.Button> : undefined}
|
? <Radio.Button value="plugin_update" disabled={!allows.pluginUpdates}>
|
||||||
|
Update Plugin
|
||||||
|
</Radio.Button> : undefined}
|
||||||
{account.hasPermission("core.plugin.install")
|
{account.hasPermission("core.plugin.install")
|
||||||
? <Radio.Button value="plugin_install">Install Plugin</Radio.Button> : undefined}
|
? <Radio.Button value="plugin_install" disabled={!allows.pluginInstall}>
|
||||||
|
Install Plugin
|
||||||
|
</Radio.Button> : undefined}
|
||||||
</Radio.Group>
|
</Radio.Group>
|
||||||
</Form.Item>
|
</Form.Item>
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in new issue
Block a user