Skip to content

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.

refactor(plugin): Modify the timing of updating plug-in status

robin0bfe533afbdc
diff --git a/ui/src/components/PluginRender/index.tsx b/ui/src/components/PluginRender/index.tsx
index d578d6f8..c4b7f886 100644
--- a/ui/src/components/PluginRender/index.tsx
+++ b/ui/src/components/PluginRender/index.tsx
@@ -22,7 +22,7 @@ interface Props {
const Index: FC<Props> = ({
slug_name,
type,
- children,
+ children = null,
className,
...props
}) => {
@@ -51,6 +51,10 @@ const Index: FC<Props> = ({
*/
if (pluginSlice.length === 0) {
+ if (type === 'editor') {
+ return <div className={className}>{children}</div>;
+ }
+
return null;
}
diff --git a/ui/src/pages/Questions/Ask/index.tsx b/ui/src/pages/Questions/Ask/index.tsx
index 4b86f59f..0f139d2f 100644
--- a/ui/src/pages/Questions/Ask/index.tsx
+++ b/ui/src/pages/Questions/Ask/index.tsx
@@ -19,10 +19,8 @@ import {
useQueryQuestionByTitle,
getTagsBySlugName,
saveQuestionWidthAnaser,
- useEditorPlugins,
} from '@/services';
import { handleFormError, SaveDraft, storageExpires } from '@/utils';
-import pluginKit from '@/utils/pluginKit';
import { pathFactory } from '@/router/pathFactory';
import SearchQuestion from './components/SearchQuestion';
@@ -106,8 +104,6 @@ const Ask = () => {
const saveCaptcha = useCaptchaModal('question');
const editCaptcha = useCaptchaModal('edit');
- const plugins = useEditorPlugins();
- pluginKit.activatePlugins(plugins.data || []);
const removeDraft = () => {
saveDraft.save.cancel();
diff --git a/ui/src/pages/Questions/Detail/index.tsx b/ui/src/pages/Questions/Detail/index.tsx
index 97828815..317454df 100644
--- a/ui/src/pages/Questions/Detail/index.tsx
+++ b/ui/src/pages/Questions/Detail/index.tsx
@@ -11,14 +11,13 @@ import { useTranslation } from 'react-i18next';
import { Pagination, CustomSidebar } from '@/components';
import { loggedUserInfoStore, toastStore } from '@/stores';
import { scrollToElementTop, scrollToDocTop } from '@/utils';
-import pluginKit from '@/utils/pluginKit';
import { usePageTags, usePageUsers } from '@/hooks';
import type {
ListResult,
QuestionDetailRes,
AnswerItem,
} from '@/common/interface';
-import { questionDetail, getAnswers, useEditorPlugins } from '@/services';
+import { questionDetail, getAnswers } from '@/services';
import {
Question,
@@ -62,8 +61,6 @@ const Index = () => {
const isLogged = Boolean(userInfo?.access_token);
const loggedUserRank = userInfo?.rank;
const { state: locationState } = useLocation();
- const plugins = useEditorPlugins();
- pluginKit.activatePlugins(plugins.data || []);
useEffect(() => {
if (locationState?.isReview) {
diff --git a/ui/src/services/client/question.ts b/ui/src/services/client/question.ts
index d3ea0d24..92cc5504 100644
--- a/ui/src/services/client/question.ts
+++ b/ui/src/services/client/question.ts
@@ -73,17 +73,3 @@ export const putInviteUser = (
...imgCode,
});
};
-
-export const useEditorPlugins = () => {
- const apiUrl = '/answer/api/v1/editor/tools';
-
- const { data, error } = useSWR<Type.ActivatedPlugin[], Error>(
- apiUrl,
- request.instance.get,
- );
- return {
- data,
- isLoading: !data && !error,
- error,
- };
-};
diff --git a/ui/src/services/common.ts b/ui/src/services/common.ts
index 2a35aa96..b0e9248c 100644
--- a/ui/src/services/common.ts
+++ b/ui/src/services/common.ts
@@ -289,3 +289,7 @@ export const saveQuestionWidthAnaser = (params: Type.QuestionWithAnswer) => {
export const questionOpetation = (params: Type.QuestionOperationReq) => {
return request.put('/answer/api/v1/question/operation', params);
};
+
+export const getPluginsStatus = () => {
+ return request.get<Type.ActivatedPlugin[]>('/answer/api/v1/plugin/status');
+};
diff --git a/ui/src/utils/pluginKit/index.ts b/ui/src/utils/pluginKit/index.ts
index 89393a66..3ccae657 100644
--- a/ui/src/utils/pluginKit/index.ts
+++ b/ui/src/utils/pluginKit/index.ts
@@ -3,6 +3,7 @@ import { NamedExoticComponent, FC } from 'react';
import builtin from '@/plugins/builtin';
import * as allPlugins from '@/plugins';
import type * as Type from '@/common/interface';
+import { getPluginsStatus } from '@/services';
import { initI18nResource } from './utils';
@@ -42,6 +43,10 @@ class Plugins {
constructor() {
this.registerBuiltin();
this.registerPlugins();
+
+ getPluginsStatus().then((plugins) => {
+ this.activatePlugins(plugins);
+ });
}
validate(plugin: Plugin) {