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(admin/users): Adjustment of the way to determine the availability of administrator actions
haitaoo29fddeca3525
diff --git a/ui/src/pages/Admin/Seo/index.tsx b/ui/src/pages/Admin/Seo/index.tsxindex 6c979dc0..a682fbaf 100644--- a/ui/src/pages/Admin/Seo/index.tsx+++ b/ui/src/pages/Admin/Seo/index.tsx@@ -80,7 +80,7 @@ const Index: FC = () => {formMeta.robots.value = setting.robots;formMeta.permalink.value = setting.permalink;if (!/[1234]/.test(formMeta.permalink.value)) {- formMeta.permalink.value = 1;+ formMeta.permalink.value = 4;}setFormData(formMeta);}diff --git a/ui/src/pages/Admin/Users/index.tsx b/ui/src/pages/Admin/Users/index.tsxindex bf6a2c8d..1c1b8fc1 100644--- a/ui/src/pages/Admin/Users/index.tsx+++ b/ui/src/pages/Admin/Users/index.tsx@@ -57,8 +57,10 @@ const Users: FC = () => {const currentUser = loggedUserInfoStore((state) => state.user);const { agent: ucAgent } = userCenterStore();const [adminUcAgent, setAdminUcAgent] = useState<AdminUcAgent>({- user_status_agent_enabled: false,- user_password_agent_enabled: false,+ allow_create_user: true,+ allow_update_user_status: true,+ allow_update_user_password: true,+ allow_update_user_role: true,});const Toast = useToast();const {@@ -156,6 +158,18 @@ const Users: FC = () => {});}}, [ucAgent]);+ const showAddUser =+ !ucAgent?.enabled || (ucAgent?.enabled && adminUcAgent?.allow_create_user);+ const showActionPassword =+ !ucAgent?.enabled ||+ (ucAgent?.enabled && adminUcAgent?.allow_update_user_password);+ const showActionRole =+ !ucAgent?.enabled ||+ (ucAgent?.enabled && adminUcAgent?.allow_update_user_role);+ const showActionStatus =+ !ucAgent?.enabled ||+ (ucAgent?.enabled && adminUcAgent?.allow_update_user_status);+ const showAction = showActionPassword || showActionRole || showActionStatus;return (<><h3 className="mb-4">{t('title')}</h3>@@ -167,7 +181,7 @@ const Users: FC = () => {sortKey="filter"i18nKeyPrefix="admin.users"/>- {!ucAgent?.enabled ? (+ {showAddUser ? (<Buttonvariant="outline-primary"size="sm"@@ -252,31 +266,31 @@ const Users: FC = () => {</span></td>)}- {curFilter !== 'deleted' ? (+ {curFilter !== 'deleted' && showAction ? (<td className="text-end"><Dropdown><Dropdown.Toggle variant="link" className="no-toggle"><Icon name="three-dots-vertical" /></Dropdown.Toggle><Dropdown.Menu>- {!ucAgent?.enabled ||- !adminUcAgent.user_password_agent_enabled ? (+ {showActionPassword ? (<Dropdown.ItemonClick={() => handleAction('password', user)}>{t('set_new_password')}</Dropdown.Item>) : null}- {!ucAgent?.enabled ||- !adminUcAgent.user_status_agent_enabled ? (+ {showActionStatus ? (<Dropdown.ItemonClick={() => handleAction('status', user)}>{t('change_status')}</Dropdown.Item>) : null}- <Dropdown.Item- onClick={() => handleAction('role', user)}>- {t('change_role')}- </Dropdown.Item>+ {showActionRole ? (+ <Dropdown.Item+ onClick={() => handleAction('role', user)}>+ {t('change_role')}+ </Dropdown.Item>+ ) : null}</Dropdown.Menu></Dropdown></td>diff --git a/ui/src/services/user-center/index.ts b/ui/src/services/user-center/index.tsindex 5610be80..84851eb4 100644--- a/ui/src/services/user-center/index.ts+++ b/ui/src/services/user-center/index.ts@@ -40,8 +40,10 @@ export interface UcBranding {}export interface AdminUcAgent {- user_status_agent_enabled: boolean;- user_password_agent_enabled: boolean;+ allow_create_user: boolean;+ allow_update_user_status: boolean;+ allow_update_user_password: boolean;+ allow_update_user_role: boolean;}export const getUcAgent = () => {