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: Show `privilege` form dynamic fields

haitaooa38c6a833f60
diff --git a/ui/src/components/SchemaForm/components/Input.tsx b/ui/src/components/SchemaForm/components/Input.tsx
index 3b6bd862..ed3e8d2f 100644
--- a/ui/src/components/SchemaForm/components/Input.tsx
+++ b/ui/src/components/SchemaForm/components/Input.tsx
@@ -9,6 +9,7 @@ interface Props {
fieldName: string;
onChange: (evt: React.ChangeEvent<HTMLInputElement>, ...rest) => void;
formData: Type.FormDataType;
+ readOnly: boolean;
}
const Index: FC<Props> = ({
type = 'text',
@@ -16,6 +17,7 @@ const Index: FC<Props> = ({
fieldName,
onChange,
formData,
+ readOnly = false,
}) => {
const fieldObject = formData[fieldName];
return (
@@ -25,8 +27,9 @@ const Index: FC<Props> = ({
type={type}
value={fieldObject?.value || ''}
onChange={onChange}
- style={type === 'color' ? { width: '6rem' } : {}}
+ readOnly={readOnly}
isInvalid={fieldObject?.isInvalid}
+ style={type === 'color' ? { width: '6rem' } : {}}
/>
);
};
diff --git a/ui/src/components/SchemaForm/index.tsx b/ui/src/components/SchemaForm/index.tsx
index bf8af1fc..60136b12 100644
--- a/ui/src/components/SchemaForm/index.tsx
+++ b/ui/src/components/SchemaForm/index.tsx
@@ -45,6 +45,7 @@ export interface BaseUIOptions {
// The className that will be attached to a form field container
fieldClassName?: classnames.Argument;
// Make a form component render into simplified mode
+ readOnly?: boolean;
simplify?: boolean;
validator?: (
value,
@@ -134,9 +135,12 @@ interface IRef {
/**
* TODO:
- * * Normalize and document `formData[key].hidden && 'd-none'`
- * * `handleXXChange` methods are placed in the concrete component
- * * Improving field hints for `formData`
+ * - Normalize and document `formData[key].hidden && 'd-none'`
+ * - `handleXXChange` methods are placed in the concrete component
+ * - Improving field hints for `formData`
+ * - Optimise form data updates
+ * * Automatic field type conversion
+ * * Dynamic field generation
*/
/**
@@ -378,7 +382,7 @@ const SchemaForm: ForwardRefRenderFunction<IRef, IProps> = (
} = properties[key];
const { 'ui:widget': widget = 'input', 'ui:options': uiOpt } =
uiSchema[key] || {};
- const fieldData = formData[key];
+ const fieldState = formData[key];
const uiSimplify = widget === 'legend' || uiOpt?.simplify;
let groupClassName: BaseUIOptions['fieldClassName'] = uiOpt?.simplify
? 'mb-2'
@@ -389,6 +393,7 @@ const SchemaForm: ForwardRefRenderFunction<IRef, IProps> = (
if (uiOpt?.fieldClassName) {
groupClassName = uiOpt.fieldClassName;
}
+ const readOnly = uiOpt?.readOnly || false;
return (
<Form.Group
@@ -472,11 +477,12 @@ const SchemaForm: ForwardRefRenderFunction<IRef, IProps> = (
fieldName={key}
onChange={handleInputChange}
formData={formData}
+ readOnly={readOnly}
/>
) : null}
{/* Unified handling of `Feedback` and `Text` */}
<Form.Control.Feedback type="invalid">
- {fieldData?.errorMsg}
+ {fieldState?.errorMsg}
</Form.Control.Feedback>
{description ? (
<Form.Text className="text-muted">{description}</Form.Text>
diff --git a/ui/src/pages/Admin/Privileges/index.tsx b/ui/src/pages/Admin/Privileges/index.tsx
index e17e9b3c..50a9d45f 100644
--- a/ui/src/pages/Admin/Privileges/index.tsx
+++ b/ui/src/pages/Admin/Privileges/index.tsx
@@ -10,7 +10,6 @@ import {
AdminSettingsPrivilege,
} from '@/services';
import { handleFormError } from '@/utils';
-import * as Type from '@/common/interface';
const Index: FC = () => {
const { t } = useTranslation('translation', {
@@ -18,27 +17,66 @@ const Index: FC = () => {
});
const Toast = useToast();
const [privilege, setPrivilege] = useState<AdminSettingsPrivilege>();
-
- const schema: JSONSchema = {
+ const [schema, setSchema] = useState<JSONSchema>({
title: t('title'),
- properties: {
+ properties: {},
+ });
+ const [uiSchema, setUiSchema] = useState<UISchema>({
+ level: {
+ 'ui:widget': 'select',
+ },
+ });
+ const [formData, setFormData] = useState<FormDataType>(initFormData(schema));
+
+ const setFormConfig = (selectedLevel: number = 1) => {
+ selectedLevel = Number(selectedLevel);
+ const levelOptions = privilege?.options;
+ const curLevel = levelOptions?.find((li) => {
+ return li.level === selectedLevel;
+ });
+ if (!levelOptions || !curLevel) {
+ return;
+ }
+ const uiState = {
+ level: uiSchema.level,
+ };
+ const props: JSONSchema['properties'] = {
level: {
type: 'number',
title: t('level.label'),
description: t('level.text'),
- enum: privilege?.options.map((_) => _.level),
- enumNames: privilege?.options.map((_) => _.level_desc),
- default: 1,
+ enum: levelOptions.map((_) => _.level),
+ enumNames: levelOptions.map((_) => _.level_desc),
+ default: selectedLevel,
},
- },
- };
-
- const [formData, setFormData] = useState<FormDataType>(initFormData(schema));
-
- const uiSchema: UISchema = {
- level: {
- 'ui:widget': 'select',
- },
+ };
+ curLevel.privileges.forEach((li) => {
+ props[li.key] = {
+ type: 'number',
+ title: li.label,
+ default: li.value,
+ };
+ uiState[li.key] = {
+ 'ui:options': {
+ readOnly: true,
+ },
+ };
+ });
+ const schemaState = {
+ ...schema,
+ properties: props,
+ };
+ const formState = initFormData(schemaState);
+ curLevel.privileges.forEach((li) => {
+ formState[li.key] = {
+ value: li.value,
+ isInvalid: false,
+ errorMsg: '',
+ };
+ });
+ setSchema(schemaState);
+ setUiSchema(uiState);
+ setFormData(formState);
};
const onSubmit = (evt: FormEvent) => {
@@ -60,21 +98,19 @@ const Index: FC = () => {
});
};
+ useEffect(() => {
+ if (!privilege) {
+ return;
+ }
+ setFormConfig(privilege.selected_level);
+ }, [privilege]);
useEffect(() => {
getPrivilegeSetting().then((resp) => {
setPrivilege(resp);
- const formMeta: Type.FormDataType = {};
- formMeta.level = {
- value: resp.selected_level,
- errorMsg: '',
- isInvalid: false,
- };
- setFormData({ ...formData, ...formMeta });
});
}, []);
-
- const handleOnChange = (data) => {
- setFormData(data);
+ const handleOnChange = (state) => {
+ setFormConfig(state.level.value);
};
return (
diff --git a/ui/src/services/admin/settings.ts b/ui/src/services/admin/settings.ts
index f9398bbe..d2919972 100644
--- a/ui/src/services/admin/settings.ts
+++ b/ui/src/services/admin/settings.ts
@@ -19,6 +19,7 @@ interface PrivilegeLevel {
privileges: {
label: string;
value: number;
+ key: string;
}[];
}
export interface AdminSettingsPrivilege {