self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2025-11-29 22:48:10 +02:00
Code Issues Releases Activity

Desktop: Resolves #6143: Show installed plugins in Help - About Joplin (#7711)

Browse Source
This commit is contained in:
Julien
2023-02-08 22:16:09 +08:00
committed by GitHub
parent 7841c99c02
commit 631c41a1ff
7 changed files with 186 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
packages/app-desktop/gui/ErrorBoundary.tsx
View File

@@ -1,6 +1,6 @@
import * as React from 'react';
import versionInfo from '@joplin/lib/versionInfo';
import PluginService from '@joplin/lib/services/plugins/PluginService';
import PluginService, { Plugins } from '@joplin/lib/services/plugins/PluginService';
import Setting from '@joplin/lib/models/Setting';
import restart from '../services/restart';
const packageInfo = require('../packageInfo.js');
@@ -21,6 +21,7 @@ interface State {
error: Error;
errorInfo: ErrorInfo;
pluginInfos: PluginInfo[];
plugins: Plugins;
}
interface Props {
@@ -29,14 +30,16 @@ interface Props {
export default class ErrorBoundary extends React.Component<Props, State> {
public state: State = { error: null, errorInfo: null, pluginInfos: [] };
public state: State = { error: null, errorInfo: null, pluginInfos: [], plugins: {} };
componentDidCatch(error: any, errorInfo: ErrorInfo) {
if (typeof error === 'string') error = { message: error };
const pluginInfos: PluginInfo[] = [];
let plugins: Plugins = {};
try {
const service = PluginService.instance();
plugins = service.plugins;
const pluginSettings = service.unserializePluginSettings(Setting.value('plugins.states'));
for (const pluginId in pluginSettings) {
const plugin = PluginService.instance().pluginById(pluginId);
@@ -52,7 +55,7 @@ export default class ErrorBoundary extends React.Component<Props, State> {
console.error('Could not get plugin info:', error);
}
this.setState({ error, errorInfo, pluginInfos });
this.setState({ error, errorInfo, pluginInfos, plugins });
}
componentDidMount() {
@@ -91,7 +94,7 @@ export default class ErrorBoundary extends React.Component<Props, State> {
output.push(
<section key="versionInfo">
<h2>Version info</h2>
<pre>{versionInfo(packageInfo).message}</pre>
<pre>{versionInfo(packageInfo, this.state.plugins).message}</pre>
</section>
);