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

fix: pvc events api

Browse Source
This commit is contained in:
jialin
2026-05-26 19:16:50 +08:00
committed by jialin
parent c6e34db329
commit 7f14eb544c
13 changed files with 51 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files
config/routes.ts
+1 -1
View File
@@ -186,7 +186,6 @@ const baseRoutes = [
name: 'gpuService',
path: '/gpu-service',
key: 'gpuService',
access: 'canSeeAdmin',
routes: [
{
path: '/gpu-service',
@@ -224,6 +223,7 @@ const baseRoutes = [
path: '/gpu-service/storage-types',
key: 'gpuServiceStorageTypes',
icon: 'icon-storage-outlined',
access: 'canSeeAdmin',
selectedIcon: 'icon-storage-filled',
defaultIcon: 'icon-storage-outlined',
component: './gpu-service/storage-types'
src/pages/_components/number-selection/index.tsx
+8 -6
View File
@@ -46,9 +46,11 @@ const NumberSelection: React.FC<NumberSelectionProps> = ({
{ length: Math.max(0, maxCount) },
(_, i) => i + 1
);
if (min <= 0) {
presetItems.unshift(0);
}
const items = presetItems;
const isItemDisabled = (num: number) =>
!!disabled || num > max || num < min;
const isItemDisabled = (num: number) => !!disabled || num > max || num < min;
const [inputValue, setInputValue] = useState<number | null>(() =>
value !== undefined && value !== null && !presetItems.includes(value)
? value
@@ -113,7 +115,7 @@ const NumberSelection: React.FC<NumberSelectionProps> = ({
aria-disabled={itemDisabled}
tabIndex={itemDisabled ? -1 : 0}
className={classNames(styles.numberItem, {
[styles.active]: num === value && !!value,
[styles.active]: num === value && value != null,
[styles.itemDisabled]: itemDisabled && !disabled
})}
onClick={() => handleSelect(num)}
@@ -134,7 +136,7 @@ const NumberSelection: React.FC<NumberSelectionProps> = ({
<div className={styles.line}></div>
<div
className={classNames(styles.inputContainer, {
[styles.hasValue]: !!inputValue
[styles.hasValue]: inputValue != null
})}
>
<InputNumber
@@ -144,7 +146,7 @@ const NumberSelection: React.FC<NumberSelectionProps> = ({
max={max}
step={step}
disabled={disabled}
value={inputValue || undefined}
value={inputValue ?? undefined}
style={{
fontSize: 14,
width: 60,
@@ -154,7 +156,7 @@ const NumberSelection: React.FC<NumberSelectionProps> = ({
}}
styles={{
input: {
fontWeight: inputValue ? 500 : 400,
fontWeight: inputValue != null ? 500 : 400,
...(styles?.input as React.CSSProperties)
}
}}
src/pages/gpu-service/instances/components/instance-type-item.tsx
+1 -1
View File
@@ -162,7 +162,7 @@ const InstanceTypeItem: React.FC<InstanceTypeItemProps> = ({ item }) => {
show={!!remainingData.cpu}
showDot={true}
icon="icon-cpu"
label="vCPU"
label="CPU"
value={remainingData.cpu ?? '-'}
></MetaItem>
</span>
src/pages/gpu-service/instances/components/view-events-modal.tsx
+18 -4
View File
@@ -18,6 +18,7 @@ type ViewEventsModalProps = {
open: boolean;
name: string;
namespace: string;
volumeName?: string;
clusterID?: number;
hasPersistentVolume?: boolean;
onCancel: () => void;
@@ -32,8 +33,15 @@ const eventTypeStatus: Record<string, 'success' | 'warning' | 'error'> = {
const ViewEventsModal: React.FC<ViewEventsModalProps> = (props) => {
const intl = useIntl();
const { open, onCancel, name, namespace, clusterID, hasPersistentVolume } =
props || {};
const {
open,
onCancel,
name,
namespace,
clusterID,
volumeName,
hasPersistentVolume
} = props || {};
const [activeKey, setActiveKey] = useState('instance');
const {
@@ -57,7 +65,7 @@ const ViewEventsModal: React.FC<ViewEventsModalProps> = (props) => {
if (!name || !namespace || !clusterID) return;
fetchInstanceEvents({ name, namespace, clusterID });
if (hasPersistentVolume) {
fetchVolumeEvents({ name, namespace, clusterID });
fetchVolumeEvents({ name: volumeName || '', namespace, clusterID });
}
};
@@ -206,7 +214,10 @@ const ViewEventsModal: React.FC<ViewEventsModalProps> = (props) => {
return (
<ScrollerModal
title={
<span className="flex flex-center" style={{ gap: 8 }}>
<span
className="flex flex-center"
style={{ gap: 8, paddingInline: 24 }}
>
<span style={{ fontWeight: 'var(--font-weight-bold)' }}>
{intl.formatMessage({ id: 'common.button.viewevent' })}
</span>
@@ -232,6 +243,9 @@ const ViewEventsModal: React.FC<ViewEventsModalProps> = (props) => {
styles={{
wrapper: {
borderRadius: 0
},
container: {
paddingInline: 0
}
}}
width="1000px"
src/pages/gpu-service/instances/config/index.ts
+11 -4
View File
@@ -13,7 +13,8 @@ export const InstanceStatusValueMap = {
Initialized: 'Initialized',
Preparing: 'Preparing',
NotReady: 'NotReady',
Ready: 'Ready'
Ready: 'Ready',
Staring: 'Staring'
};
export const InstanceStatusLabelMap: Record<string, string> = {
@@ -25,7 +26,8 @@ export const InstanceStatusLabelMap: Record<string, string> = {
[InstanceStatusValueMap.Initialized]: 'Initialized',
[InstanceStatusValueMap.Preparing]: 'Preparing',
[InstanceStatusValueMap.NotReady]: 'NotReady',
[InstanceStatusValueMap.Ready]: 'Ready'
[InstanceStatusValueMap.Ready]: 'Ready',
[InstanceStatusValueMap.Staring]: 'Staring'
};
export const status: Record<string, StatusType> = {
@@ -37,7 +39,8 @@ export const status: Record<string, StatusType> = {
[InstanceStatusValueMap.Initialized]: StatusMaps.transitioning,
[InstanceStatusValueMap.Preparing]: StatusMaps.transitioning,
[InstanceStatusValueMap.NotReady]: StatusMaps.error,
[InstanceStatusValueMap.Ready]: StatusMaps.success
[InstanceStatusValueMap.Ready]: StatusMaps.success,
[InstanceStatusValueMap.Staring]: StatusMaps.transitioning
};
// Lifecycle actions (logs/events/start/stop) require K8s proxy endpoints that
@@ -207,6 +210,10 @@ export const pickCandidateForAccelerator = <
const sorted = [...tiers].sort(
(a, b) => parseQuantity(a.onceMaxRequest) - parseQuantity(b.onceMaxRequest)
);
const tier = sorted.find((t) => parseQuantity(t.onceMaxRequest) >= count);
const tier = sorted.find((t) =>
count === 0
? parseQuantity(t.onceMaxRequest) > count
: parseQuantity(t.onceMaxRequest) >= count
);
return tier?.candidates?.[0] ?? null;
};
src/pages/gpu-service/instances/forms/storage-volume.tsx
+1
View File
@@ -199,6 +199,7 @@ const StorageVolume = ({
>
<Select
disabled={disabled}
showSearch
label={intl.formatMessage({
id: 'gpuservice.storage.persistentVolume'
})}
src/pages/gpu-service/instances/hooks/use-instances-columns.tsx
+1 -1
View File
@@ -113,7 +113,7 @@ const useInstancesColumns = ({
title: intl.formatMessage({ id: 'common.table.name' }),
dataIndex: 'name',
key: 'name',
sorter: false,
sorter: true,
ellipsis: {
showTitle: false
},
src/pages/gpu-service/instances/hooks/use-view-events.ts
+6 -1
View File
@@ -9,12 +9,14 @@ const useViewEvents = () => {
name: string;
namespace: string;
clusterID?: number;
volumeName?: string;
hasPersistentVolume: boolean;
}>({
open: false,
name: '',
namespace: '',
clusterID: undefined,
volumeName: undefined,
hasPersistentVolume: false
});
@@ -25,7 +27,9 @@ const useViewEvents = () => {
name: row?.name || '',
namespace: row?.status?.namespace || '',
clusterID: row?.clusterId ?? undefined,
hasPersistentVolume: !!volume?.persistent?.name
volumeName: volume?.persistent?.name || volume?.persistentTemplate?.name,
hasPersistentVolume:
!!volume?.persistent?.name || !!volume?.persistentTemplate?.name
});
};
@@ -35,6 +39,7 @@ const useViewEvents = () => {
name: '',
namespace: '',
clusterID: undefined,
volumeName: undefined,
hasPersistentVolume: false
});
};
src/pages/gpu-service/instances/index.tsx
+1
View File
@@ -233,6 +233,7 @@ const GPUService: React.FC = () => {
name={openViewEventsModalStatus.name}
namespace={openViewEventsModalStatus.namespace}
clusterID={openViewEventsModalStatus.clusterID}
volumeName={openViewEventsModalStatus.volumeName}
hasPersistentVolume={openViewEventsModalStatus.hasPersistentVolume}
onCancel={closeViewEventsModal}
/>
src/pages/gpu-service/public-keys/forms/basic.tsx
-6
View File
@@ -36,12 +36,6 @@ const Basic = ({ action }: { action: string }) => {
label={intl.formatMessage({ id: 'common.table.displayName' })}
/>
</Form.Item>
<Form.Item<FormData> name="description">
<Textarea
scaleSize={true}
label={intl.formatMessage({ id: 'common.table.description' })}
/>
</Form.Item>
<Form.Item<FormData>
name={['spec', 'data']}
rules={[
src/pages/gpu-service/public-keys/hooks/use-public-key-columns.tsx
+1 -15
View File
@@ -39,7 +39,7 @@ const usePublicKeyColumns = ({
title: intl.formatMessage({ id: 'common.table.name' }),
dataIndex: 'name',
key: 'name',
sorter: false,
sorter: true,
ellipsis: {
showTitle: false
},
@@ -49,20 +49,6 @@ const usePublicKeyColumns = ({
</AutoTooltip>
)
},
{
title: intl.formatMessage({ id: 'common.table.description' }),
dataIndex: 'description',
key: 'description',
sorter: false,
ellipsis: {
showTitle: false
},
render: (text: string) => (
<AutoTooltip ghost style={{ maxWidth: 360 }}>
{text || '-'}
</AutoTooltip>
)
},
{
title: intl.formatMessage({ id: 'common.table.createTime' }),
dataIndex: 'created_at',
src/pages/gpu-service/storage-types/hooks/use-storage-type-columns.tsx
+1 -1
View File
@@ -52,7 +52,7 @@ const useStorageTypeColumns = ({
title: intl.formatMessage({ id: 'common.table.name' }),
dataIndex: 'name',
key: 'name',
sorter: false,
sorter: true,
ellipsis: { showTitle: false },
render: (text: string, record: ListItem) => (
<AutoTooltip ghost minWidth={20}>
src/pages/gpu-service/storage/hooks/use-storage-columns.tsx
+1 -1
View File
@@ -24,7 +24,7 @@ const useStorageColumns = ({
title: intl.formatMessage({ id: 'common.table.name' }),
dataIndex: 'name',
key: 'name',
sorter: false,
sorter: true,
ellipsis: {
showTitle: false
},