A Q&A platform software for teams at any scales. Whether it's a community forum, help center, or knowledge management platform, you can always count on Apache Answer.
fix: conflict (#572)
dashuai223147e29d56
diff --git a/ui/src/plugins/builtin/SearchInfo/index.tsx b/ui/src/plugins/builtin/SearchInfo/index.tsxindex 218d6ca5..68ad874a 100644--- a/ui/src/plugins/builtin/SearchInfo/index.tsx+++ b/ui/src/plugins/builtin/SearchInfo/index.tsx@@ -20,7 +20,7 @@ const Index: FC = () => {});const { data } = useGetSearchPLuginInfo();- // if (!data?.icon) return null;+ if (!data?.icon) return null;return (<adiff --git a/ui/src/utils/pluginKit/index.ts b/ui/src/utils/pluginKit/index.tsindex 01d9bdbf..8172ecb2 100644--- a/ui/src/utils/pluginKit/index.ts+++ b/ui/src/utils/pluginKit/index.ts@@ -70,6 +70,9 @@ class Plugins {registerBuiltin() {Object.keys(builtin).forEach((key) => {const plugin = builtin[key];+ // builttin plugins are always activated+ // Use own internal rendering logic'+ plugin.activated = true;this.register(plugin);});}@@ -93,13 +96,13 @@ class Plugins {}activatePlugins(activatedPlugins: Type.ActivatedPlugin[]) {- this.plugins.forEach((plugin) => {+ this.plugins.forEach((plugin: any) => {const { slug_name } = plugin.info;- const activatedPlugin = activatedPlugins?.find(+ const activatedPlugin: any = activatedPlugins?.find((p) => p.slug_name === slug_name,);if (activatedPlugin) {- plugin.activated = true;+ plugin.activated = activatedPlugin?.enabled;}});}