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.

feat(admin/users): Determine if user status changes are allowed via `adminUcAgent`

haitaooc62436a70361
diff --git a/ui/src/pages/Admin/Users/index.tsx b/ui/src/pages/Admin/Users/index.tsx
index 7eb3116f..c4d247f1 100644
--- a/ui/src/pages/Admin/Users/index.tsx
+++ b/ui/src/pages/Admin/Users/index.tsx
@@ -1,4 +1,4 @@
-import { FC } from 'react';
+import { FC, useEffect, useState } from 'react';
import { Form, Table, Dropdown, Button, Stack } from 'react-bootstrap';
import { useSearchParams } from 'react-router-dom';
import { useTranslation } from 'react-i18next';
@@ -21,7 +21,13 @@ import {
useChangePasswordModal,
useToast,
} from '@/hooks';
-import { useQueryUsers, addUser, updateUserPassword } from '@/services';
+import {
+ useQueryUsers,
+ addUser,
+ updateUserPassword,
+ getAdminUcAgent,
+ AdminUcAgent,
+} from '@/services';
import { loggedUserInfoStore, userCenterStore } from '@/stores';
import { formatCount } from '@/utils';
@@ -50,6 +56,9 @@ const Users: FC = () => {
const curQuery = urlSearchParams.get('query') || '';
const currentUser = loggedUserInfoStore((state) => state.user);
const { agent: ucAgent } = userCenterStore();
+ const [adminUcAgent, setAdminUcAgent] = useState<AdminUcAgent>({
+ user_status_agent_enabled: false,
+ });
const Toast = useToast();
const {
data,
@@ -139,6 +148,13 @@ const Users: FC = () => {
urlSearchParams.delete('page');
setUrlSearchParams(urlSearchParams);
};
+ useEffect(() => {
+ if (ucAgent?.enabled) {
+ getAdminUcAgent().then((resp) => {
+ setAdminUcAgent(resp);
+ });
+ }
+ }, [ucAgent]);
return (
<>
<h3 className="mb-4">{t('title')}</h3>
@@ -248,7 +264,8 @@ const Users: FC = () => {
{t('set_new_password')}
</Dropdown.Item>
) : null}
- {!ucAgent?.enabled ? (
+ {!ucAgent?.enabled ||
+ !adminUcAgent.user_status_agent_enabled ? (
<Dropdown.Item
onClick={() => handleAction('status', user)}>
{t('change_status')}
diff --git a/ui/src/services/user-center/index.ts b/ui/src/services/user-center/index.ts
index 583783a6..ace4be19 100644
--- a/ui/src/services/user-center/index.ts
+++ b/ui/src/services/user-center/index.ts
@@ -37,11 +37,18 @@ export interface UcBranding {
personal_branding: UcBrandingEntry[];
}
+export interface AdminUcAgent {
+ user_status_agent_enabled: boolean;
+}
+
export const getUcAgent = () => {
const apiUrl = `/answer/api/v1/user-center/agent`;
return request.get<UcAgent>(apiUrl);
};
-
+export const getAdminUcAgent = () => {
+ const apiUrl = `/answer/admin/api/user-center/agent`;
+ return request.get<AdminUcAgent>(apiUrl);
+};
export const getUcSettings = () => {
const apiUrl = `/answer/api/v1/user-center/user/settings`;
return request.get<UcSettings>(apiUrl);