root/gpustack-ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: access setting notes

Browse Source
This commit is contained in:
jialin
2025-11-21 20:10:21 +08:00
parent e80ecfac8d
commit f49001b742
15 changed files with 220 additions and 43 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/pages/api-keys/components/add-apikey-modal/allow-models.tsx
+6 -1
View File
@@ -19,7 +19,8 @@ const Label = styled.div`
const AllowModelsForm: React.FC<{
currentData?: Partial<ListItem> | null;
action: PageActionType;
}> = ({ currentData, action }) => {
onValuesChange?: (changedValues: any, allValues: any) => void;
}> = ({ currentData, action, onValuesChange }) => {
const intl = useIntl();
const { getRuleMessage } = useAppUtils();
const form = Form.useFormInstance();
@@ -102,6 +103,10 @@ const AllowModelsForm: React.FC<{
})}
onSelectChange={(selectedKeys) => {
form.setFieldsValue({ allowed_model_names: selectedKeys });
onValuesChange?.(
{ allowed_model_names: selectedKeys },
form.getFieldsValue()
);
}}
/>
</Form.Item>
src/pages/api-keys/components/add-apikey-modal/form.tsx
+3 -1
View File
@@ -12,7 +12,8 @@ import AllowModelsForm from './allow-models';
const APIKeyForm: React.FC<{
action: PageActionType;
currentData?: Partial<ListItem> | null;
}> = ({ action, currentData }) => {
onValuesChange?: (changedValues: any, allValues: any) => void;
}> = ({ action, currentData, onValuesChange }) => {
const intl = useIntl();
return (
@@ -70,6 +71,7 @@ const APIKeyForm: React.FC<{
<AllowModelsForm
currentData={currentData}
action={action}
onValuesChange={onValuesChange}
></AllowModelsForm>
</>
);
src/pages/api-keys/components/add-apikey-modal/index.tsx
+75 -24
View File
@@ -1,3 +1,4 @@
import AlertBlockInfo from '@/components/alert-info/block';
import CopyButton from '@/components/copy-button';
import ModalFooter from '@/components/modal-footer';
import GSDrawer from '@/components/scroller-modal/gs-drawer';
@@ -9,7 +10,7 @@ import { useIntl } from '@umijs/max';
import { Form, Tag } from 'antd';
import dayjs from 'dayjs';
import _ from 'lodash';
import { useEffect, useState } from 'react';
import { useEffect, useRef, useState } from 'react';
import { createApisKey, updateApisKey } from '../../apis';
import { expirationOptions } from '../../config';
import { FormData, ListItem } from '../../config/types';
@@ -37,6 +38,11 @@ const AddModal: React.FC<AddModalProps> = ({
const [showKey, setShowKey] = useState(false);
const [apikeyValue, setAPIKeyValue] = useState('');
const [loading, setLoading] = useState(false);
const [isChanged, setIsChanged] = useState(false);
const cacheFormRef = useRef<{
allowed_type: string;
allowed_model_names: string[];
}>({} as any);
const getExpireValue = (val: number | null) => {
const expires_in = val;
@@ -128,6 +134,21 @@ const AddModal: React.FC<AddModalProps> = ({
setShowKey(false);
};
const handleOnValuesChange = async (changedValues: any, allValues: any) => {
const initialValues = cacheFormRef.current;
await new Promise((resolve) => {
setTimeout(resolve, 100);
});
console.log('initialValues', initialValues, allValues);
if (
_.isEqual(initialValues, _.pick(allValues, Object.keys(initialValues)))
) {
setIsChanged(false);
} else {
setIsChanged(true);
}
};
const initValues = () => {
if (action === PageAction.CREATE && open) {
form.setFieldsValue({
@@ -146,10 +167,19 @@ const AddModal: React.FC<AddModalProps> = ({
allowed_model_names: currentData.allowed_model_names || []
});
}
cacheFormRef.current = {
allowed_type: form.getFieldValue('allowed_type'),
allowed_model_names: form.getFieldValue('allowed_model_names')
};
};
useEffect(() => {
initValues();
if (!open) {
setIsChanged(false);
cacheFormRef.current = {} as any;
}
}, [open]);
return (
@@ -183,29 +213,45 @@ const AddModal: React.FC<AddModalProps> = ({
}}
footer={
!showKey ? (
<ModalFooter
onOk={handleSumit}
onCancel={onCancel}
loading={loading}
style={{
padding: '16px 24px',
display: 'flex',
justifyContent: 'flex-end'
}}
></ModalFooter>
<>
{isChanged && (
<div style={{ marginInline: 24 }}>
<AlertBlockInfo
type="warning"
style={{ marginBottom: 16 }}
contentStyle={{ paddingInline: 0 }}
message={intl.formatMessage({
id: 'models.button.accessSettings.tips'
})}
></AlertBlockInfo>
</div>
)}
<ModalFooter
onOk={handleSumit}
onCancel={onCancel}
loading={loading}
style={{
padding: '16px 24px',
display: 'flex',
justifyContent: 'flex-end'
}}
></ModalFooter>
</>
) : (
<ModalFooter
onOk={handleDone}
onCancel={onCancel}
loading={loading}
okText={intl.formatMessage({ id: 'common.button.done' })}
showCancelBtn={false}
style={{
padding: '16px 24px',
display: 'flex',
justifyContent: 'flex-end'
}}
></ModalFooter>
<>
<ModalFooter
onOk={handleDone}
onCancel={onCancel}
loading={loading}
okText={intl.formatMessage({ id: 'common.button.done' })}
showCancelBtn={false}
style={{
padding: '16px 24px',
display: 'flex',
justifyContent: 'flex-end'
}}
></ModalFooter>
</>
)
}
>
@@ -213,10 +259,15 @@ const AddModal: React.FC<AddModalProps> = ({
name="addAPIKey"
form={form}
onFinish={handleOnOk}
onValuesChange={handleOnValuesChange}
preserve={false}
>
{!showKey && (
<APIKeyForm action={action} currentData={currentData}></APIKeyForm>
<APIKeyForm
action={action}
currentData={currentData}
onValuesChange={handleOnValuesChange}
></APIKeyForm>
)}
{showKey && action === PageAction.CREATE && (
<Form.Item>
src/pages/cluster-management/cluster-create.tsx
-3
View File
@@ -243,9 +243,6 @@ const ClusterCreate = () => {
const info = await queryClusterToken({ id: res.id });
setRegistrationInfo({
...info,
image: info.container_registry
? `${info.container_registry}/${info.image}`
: info.image,
cluster_id: res.id
});
return true;
src/pages/cluster-management/components/add-worker/index.tsx
-3
View File
@@ -68,9 +68,6 @@ const AddWorker: React.FC<AddWorkerProps> = (props) => {
firstLoad.current = false;
setRegistrationInfo({
...data,
image: data.container_registry
? `${data.container_registry}/${data.image}`
: data.image,
cluster_id: value
});
} catch (error) {
src/pages/llmodels/components/access-control-modal/form.tsx
+47 -5
View File
@@ -3,14 +3,24 @@ import { PageAction } from '@/config';
import { PageActionType } from '@/config/types';
import TransferInner from '@/pages/_components/transfer';
import { queryUsersList } from '@/pages/users/apis';
import { DownOutlined } from '@ant-design/icons';
import { DownOutlined, QuestionCircleOutlined } from '@ant-design/icons';
import { useIntl } from '@umijs/max';
import { Checkbox, Dropdown, DropdownProps, Empty, Form, Radio } from 'antd';
import {
Checkbox,
Dropdown,
DropdownProps,
Empty,
Form,
Radio,
RadioChangeEvent,
Tooltip
} from 'antd';
import {
forwardRef,
useEffect,
useImperativeHandle,
useMemo,
useRef,
useState
} from 'react';
import styled from 'styled-components';
@@ -30,10 +40,11 @@ interface AccessControlFormProps {
action: PageActionType;
currentData?: ListItem | null;
onFinish: (values: AccessControlFormData) => void;
onValuesChange?: (changedValues: any, allValues: any) => void;
}
const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => {
const { action, currentData, onFinish } = props;
const { action, currentData, onFinish, onValuesChange } = props;
const intl = useIntl();
const [form] = Form.useForm();
const accessPolicy = Form.useWatch('access_policy', form);
@@ -47,6 +58,7 @@ const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => {
const [queryParams, setQueryParams] = useState<Global.SearchParams>({
page: -1
});
const formDataCacheRef = useRef<AccessControlFormData | null>(null);
const dataList = useMemo(() => {
if (filterInUsers.size === 0) {
@@ -85,7 +97,7 @@ const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => {
}
};
const handleOnChange = (
const handleOnChange = async (
nextTargetKeys: TransferKey[],
direction: string,
removeKeys: TransferKey[]
@@ -93,6 +105,10 @@ const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => {
setTargetKeys(nextTargetKeys);
const users = nextTargetKeys.map((key) => ({ id: key }));
form.setFieldsValue({ users });
await new Promise((resolve) => {
setTimeout(resolve, 100);
});
onValuesChange?.({ users }, form.getFieldsValue());
};
const onSearch = (dir: 'left' | 'right', value: string) => {
@@ -115,6 +131,23 @@ const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => {
}
};
const handleOnPolicyChange = async (e: RadioChangeEvent) => {
console.log('policy changed:', e.target.value);
const policy = e.target.value;
if (policy === 'allowed_users') {
form.setFieldsValue({ users: formDataCacheRef.current?.users || [] });
} else {
formDataCacheRef.current = {
access_policy: policy,
users: form.getFieldValue('users') || []
};
}
await new Promise((resolve) => {
setTimeout(resolve, 100);
});
onValuesChange?.({ access_policy: policy }, form.getFieldsValue());
};
useImperativeHandle(ref, () => ({
submit: () => {
form.submit();
@@ -222,16 +255,18 @@ const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => {
<Form
form={form}
onFinish={onFinish}
preserve={false}
preserve={true}
clearOnDestroy={true}
scrollToFirstError={true}
initialValues={{
users: [],
access_policy: action === PageAction.CREATE ? 'authed' : undefined
}}
>
<Label>{intl.formatMessage({ id: 'models.table.accessScope' })}</Label>
<Form.Item<AccessControlFormData> name="access_policy" noStyle>
<Radio.Group
onChange={handleOnPolicyChange}
style={{ marginBottom: 12 }}
options={[
{
@@ -267,6 +302,13 @@ const AccessControlForm = forwardRef((props: AccessControlFormProps, ref) => {
<>
<Label>
{intl.formatMessage({ id: 'models.table.userSelection' })}
<Tooltip
title={intl.formatMessage({
id: 'models.table.userSelection.tips'
})}
>
<QuestionCircleOutlined style={{ marginLeft: 4 }} />
</Tooltip>
</Label>
<Form.Item<AccessControlFormData> name="users">
<TransferInner
src/pages/llmodels/components/access-control-modal/index.tsx
+45 -2
View File
@@ -1,9 +1,11 @@
import AlertBlockInfo from '@/components/alert-info/block';
import ModalFooter from '@/components/modal-footer';
import ScrollerModal from '@/components/scroller-modal';
import { PageActionType } from '@/config/types';
import { useIntl } from '@umijs/max';
import { message } from 'antd';
import { useRef } from 'react';
import _ from 'lodash';
import { useEffect, useRef, useState } from 'react';
import { updateModelAccessUser } from '../../apis';
import { AccessControlFormData, ListItem } from '../../config/types';
import AccessControlForm from './form';
@@ -13,6 +15,8 @@ const AccessControlModal: React.FC<
> = ({ open, title, currentData, action, onCancel }) => {
const intl = useIntl();
const form = useRef<any>(null);
const [isChanged, setIsChanged] = useState(false);
const formCacheRef = useRef<AccessControlFormData | null>(null);
const handleSumit = () => {
form.current?.submit();
@@ -36,6 +40,32 @@ const AccessControlModal: React.FC<
}
};
const handleOnValuesChange = async (changedValues: any, allValues: any) => {
console.log('changedValues', changedValues, allValues);
const initialValues = formCacheRef.current;
if (_.isEqual(initialValues, allValues)) {
setIsChanged(false);
} else {
setIsChanged(true);
}
};
useEffect(() => {
if (open) {
setIsChanged(false);
setTimeout(() => {
const initialValues = form.current?.getFieldsValue();
formCacheRef.current = {
access_policy: initialValues.access_policy,
users: initialValues.users || []
};
}, 200);
} else {
formCacheRef.current = null;
setIsChanged(false);
}
}, [open, currentData]);
return (
<ScrollerModal
title={title}
@@ -48,7 +78,19 @@ const AccessControlModal: React.FC<
keyboard={false}
width={700}
footer={
<ModalFooter onOk={handleSumit} onCancel={onCancel}></ModalFooter>
<>
{isChanged && (
<AlertBlockInfo
type="warning"
style={{ marginBottom: 16 }}
contentStyle={{ paddingInline: 0 }}
message={intl.formatMessage({
id: 'models.button.accessSettings.tips'
})}
></AlertBlockInfo>
)}
<ModalFooter onOk={handleSumit} onCancel={onCancel}></ModalFooter>
</>
}
>
<AccessControlForm
@@ -56,6 +98,7 @@ const AccessControlModal: React.FC<
currentData={currentData}
action={action as PageActionType}
onFinish={handleOnFinish}
onValuesChange={handleOnValuesChange}
/>
</ScrollerModal>
);
src/pages/llmodels/forms/schedule-type.tsx
+5 -1
View File
@@ -110,10 +110,14 @@ const ScheduleTypeForm: React.FC = () => {
await new Promise((resolve) => {
setTimeout(resolve, 100);
});
if (value === ScheduleValueMap.Auto) {
onValuesChange?.({}, form.getFieldsValue());
} else if (value === ScheduleValueMap.Manual) {
form.setFieldValue(['gpu_selector', 'gpus_per_replica'], null);
form.setFieldValue('gpu_selector', {
gpu_ids: [],
gpus_per_replica: null
});
requestAnimationFrame(() => {
setContentPaddingBottom();
});