fix: move the settings -> users section in admin to Interface #1360

Author: shuai

ui/src/common/constants.ts

@@ -126,7 +126,6 @@ export const ADMIN_NAV_MENUS = [
       { name: 'write' },
       { name: 'seo' },
       { name: 'login' },
-      { name: 'users', path: 'settings-users' },
       { name: 'privileges' },
     ],
   },
@@ -660,3 +659,46 @@ export const SYSTEM_AVATAR_OPTIONS = [
 export const TAG_SLUG_NAME_MAX_LENGTH = 35;
 
 export const DEFAULT_THEME_COLOR = '#0033ff';
+
+export const SUSPENSE_USER_TIME = [
+  {
+    label: 'hours',
+    value: '24',
+  },
+  {
+    label: 'hours',
+    value: '48',
+  },
+  {
+    label: 'hours',
+    value: '72',
+  },
+  {
+    label: 'days',
+    value: '7',
+  },
+  {
+    label: 'days',
+    value: '14',
+  },
+  {
+    label: 'months',
+    value: '1',
+  },
+  {
+    label: 'months',
+    value: '2',
+  },
+  {
+    label: 'months',
+    value: '3',
+  },
+  {
+    label: 'months',
+    value: '6',
+  },
+  {
+    label: 'year',
+    value: '1',
+  },
+];

ui/src/common/interface.ts

@@ -382,6 +382,8 @@ export interface HelmetUpdate extends Omit<HelmetBase, 'pageTitle'> {
 export interface AdminSettingsInterface {
   language: string;
   time_zone?: string;
+  default_avatar: string;
+  gravatar_base_url: string;
 }
 
 export interface AdminSettingsSmtp {
@@ -403,8 +405,6 @@ export interface AdminSettingsUsers {
   allow_update_location: boolean;
   allow_update_username: boolean;
   allow_update_website: boolean;
-  default_avatar: string;
-  gravatar_base_url: string;
 }
 
 export interface SiteSettings {

ui/src/pages/Admin/Interface/index.tsx

@@ -28,7 +28,7 @@ import {
 } from '@/common/interface';
 import { interfaceStore, loggedUserInfoStore } from '@/stores';
 import { JSONSchema, SchemaForm, UISchema } from '@/components';
-import { DEFAULT_TIMEZONE } from '@/common/constants';
+import { DEFAULT_TIMEZONE, SYSTEM_AVATAR_OPTIONS } from '@/common/constants';
 import {
   updateInterfaceSetting,
   useInterfaceSetting,
@@ -59,20 +59,35 @@ const Interface: FC = () => {
         description: t('language.text'),
         enum: langs?.map((lang) => lang.value),
         enumNames: langs?.map((lang) => lang.label),
-        default: setting?.language || storeInterface.language,
+        default:
+          setting?.language || storeInterface.language || langs?.[0]?.value,
       },
       time_zone: {
         type: 'string',
         title: t('time_zone.label'),
         description: t('time_zone.text'),
         default: setting?.time_zone || DEFAULT_TIMEZONE,
       },
+      default_avatar: {
+        type: 'string',
+        title: t('avatar.label'),
+        description: t('avatar.text'),
+        enum: SYSTEM_AVATAR_OPTIONS?.map((v) => v.value),
+        enumNames: SYSTEM_AVATAR_OPTIONS?.map((v) => v.label),
+        default: setting?.default_avatar || 'system',
+      },
+      gravatar_base_url: {
+        type: 'string',
+        title: t('gravatar_base_url.label'),
+        description: t('gravatar_base_url.text'),
+        default: setting?.gravatar_base_url || '',
+      },
     },
   };
 
   const [formData, setFormData] = useState<FormDataType>({
     language: {
-      value: setting?.language || storeInterface.language,
+      value: setting?.language || storeInterface.language || langs?.[0]?.value,
       isInvalid: false,
       errorMsg: '',
     },
@@ -81,6 +96,16 @@ const Interface: FC = () => {
       isInvalid: false,
       errorMsg: '',
     },
+    default_avatar: {
+      value: setting?.default_avatar || 'system',
+      isInvalid: false,
+      errorMsg: '',
+    },
+    gravatar_base_url: {
+      value: setting?.gravatar_base_url || '',
+      isInvalid: false,
+      errorMsg: '',
+    },
   });
 
   const uiSchema: UISchema = {
@@ -90,6 +115,15 @@ const Interface: FC = () => {
     time_zone: {
       'ui:widget': 'timezone',
     },
+    default_avatar: {
+      'ui:widget': 'select',
+    },
+    gravatar_base_url: {
+      'ui:widget': 'input',
+      'ui:options': {
+        placeholder: 'https://www.gravatar.com/avatar/',
+      },
+    },
   };
   const getLangs = async () => {
     const res: LangsType[] = await loadLanguageOptions(true);
@@ -122,6 +156,8 @@ const Interface: FC = () => {
     const reqParams: AdminSettingsInterface = {
       language: formData.language.value,
       time_zone: formData.time_zone.value,
+      default_avatar: formData.default_avatar.value,
+      gravatar_base_url: formData.gravatar_base_url.value,
     };
 
     updateInterfaceSetting(reqParams)
@@ -151,7 +187,14 @@ const Interface: FC = () => {
     if (setting) {
       const formMeta = {};
       Object.keys(setting).forEach((k) => {
-        formMeta[k] = { ...formData[k], value: setting[k] };
+        let v = setting[k];
+        if (k === 'default_avatar' && !v) {
+          v = 'system';
+        }
+        if (k === 'gravatar_base_url' && !v) {
+          v = '';
+        }
+        formMeta[k] = { ...formData[k], value: v };
       });
       setFormData({ ...formData, ...formMeta });
     }