Skip to content

Commit

Permalink
refactor(FR-535): Endpoint destroying category (#3162)
Browse files Browse the repository at this point in the history 
resolves #3183 (FR-535)

Refactors endpoint status checking by introducing a new function `isEndpointInDestroyingCategory` that accepts an endpoint object instead of individual parameters. This improves code readability and reduces repetitive parameter passing throughout the codebase.

The function consolidates the logic for determining if an endpoint is in a destroying state by checking both the replica count and status in a single location.
  • Loading branch information
@yomybaby
yomybaby committed Feb 21, 2025
1 parent aa3524c commit 79d34bd
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 55 deletions.
35 changes: 14 additions & 21 deletions react/src/components/EndpointList.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,13 +56,18 @@ export type Endpoint = NonNullable<
NonNullable<NonNullable<EndpointListQuery$data>['endpoint_list']>['items']
>[0]
>;
export const isDestroyingStatus = (
desiredSessionCount: number | null | undefined,
status: string | null | undefined,

export const isEndpointInDestroyingCategory = (
endpoint?: {
desired_session_count: number | null | undefined;
replicas: number | null | undefined;
status: string | null | undefined;
} | null,
) => {
const count = endpoint?.replicas ?? endpoint?.desired_session_count;
const status = endpoint?.status;
return (
(desiredSessionCount ?? 0) < 0 ||
_.includes(['DESTROYED', 'DESTROYING'], status ?? '')
(count ?? 0) < 0 || _.includes(['DESTROYED', 'DESTROYING'], status ?? '')
);
};

Expand Down Expand Up @@ -153,10 +158,7 @@ const EndpointList: React.FC<EndpointListProps> = ({ style, children }) => {
type="text"
icon={<SettingOutlined />}
style={
isDestroyingStatus(
row.replicas ?? row.desired_session_count,
row.status,
) ||
isEndpointInDestroyingCategory(row) ||
(!!row.created_user_email &&
row.created_user_email !== currentUser.email)
? {
Expand All @@ -167,10 +169,7 @@ const EndpointList: React.FC<EndpointListProps> = ({ style, children }) => {
}
}
disabled={
isDestroyingStatus(
row.replicas ?? row.desired_session_count,
row.status,
) ||
isEndpointInDestroyingCategory(row) ||
(!!row.created_user_email &&
row.created_user_email !== currentUser.email)
}
Expand All @@ -183,10 +182,7 @@ const EndpointList: React.FC<EndpointListProps> = ({ style, children }) => {
icon={
<DeleteOutlined
style={
isDestroyingStatus(
row.replicas ?? row.desired_session_count,
row.status,
)
isEndpointInDestroyingCategory(row)
? undefined
: {
color: token.colorError,
Expand All @@ -198,10 +194,7 @@ const EndpointList: React.FC<EndpointListProps> = ({ style, children }) => {
terminateModelServiceMutation.isPending &&
optimisticDeletingId === row.endpoint_id
}
disabled={isDestroyingStatus(
row.replicas ?? row.desired_session_count,
row.status,
)}
disabled={isEndpointInDestroyingCategory(row)}
onClick={() => {
modal.confirm({
title: t('dialog.ask.DoYouWantToDeleteSomething', {
Expand Down
43 changes: 9 additions & 34 deletions react/src/pages/EndpointDetailPage.tsx
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import AutoScalingRuleEditorModal, {
} from '../components/AutoScalingRuleEditorModal';
import BAIJSONViewerModal from '../components/BAIJSONViewerModal';
import CopyableCodeText from '../components/CopyableCodeText';
import { isDestroyingStatus } from '../components/EndpointList';
import { isEndpointInDestroyingCategory } from '../components/EndpointList';
import EndpointOwnerInfo from '../components/EndpointOwnerInfo';
import EndpointStatusTag from '../components/EndpointStatusTag';
import EndpointTokenGenerationModal from '../components/EndpointTokenGenerationModal';
Expand Down Expand Up @@ -566,10 +566,7 @@ const EndpointDetailPage: React.FC<EndpointDetailPageProps> = () => {
<Button
loading={isPendingRefetch}
icon={<ReloadOutlined />}
disabled={isDestroyingStatus(
endpoint?.replicas ?? endpoint?.desired_session_count,
endpoint?.status,
)}
disabled={isEndpointInDestroyingCategory(endpoint)}
onClick={() => {
startRefetchTransition(() => {
updateFetchKey();
Expand All @@ -587,10 +584,7 @@ const EndpointDetailPage: React.FC<EndpointDetailPageProps> = () => {
type="primary"
icon={<SettingOutlined />}
disabled={
isDestroyingStatus(
endpoint?.replicas ?? endpoint?.desired_session_count,
endpoint?.status,
) ||
isEndpointInDestroyingCategory(endpoint) ||
(!!endpoint?.created_user_email &&
endpoint?.created_user_email !== currentUser.email)
}
Expand Down Expand Up @@ -618,10 +612,7 @@ const EndpointDetailPage: React.FC<EndpointDetailPageProps> = () => {
<Button
type="primary"
icon={<PlusOutlined />}
disabled={isDestroyingStatus(
endpoint?.replicas ?? endpoint?.desired_session_count,
endpoint?.status,
)}
disabled={isEndpointInDestroyingCategory(endpoint)}
onClick={() => {
setIsOpenAutoScalingRuleModal(true);
}}
Expand Down Expand Up @@ -675,10 +666,7 @@ const EndpointDetailPage: React.FC<EndpointDetailPageProps> = () => {
type="text"
icon={<SettingOutlined />}
style={
isDestroyingStatus(
endpoint?.replicas ?? endpoint?.desired_session_count,
endpoint?.status,
) ||
isEndpointInDestroyingCategory(endpoint) ||
(!!endpoint?.created_user_email &&
endpoint?.created_user_email !== currentUser.email)
? {
Expand All @@ -689,10 +677,7 @@ const EndpointDetailPage: React.FC<EndpointDetailPageProps> = () => {
}
}
disabled={
isDestroyingStatus(
endpoint?.replicas ?? endpoint?.desired_session_count,
endpoint?.status,
) ||
isEndpointInDestroyingCategory(endpoint) ||
(!!endpoint?.created_user_email &&
endpoint?.created_user_email !== currentUser.email)
}
Expand Down Expand Up @@ -760,11 +745,7 @@ const EndpointDetailPage: React.FC<EndpointDetailPageProps> = () => {
icon={
<DeleteOutlined
style={
isDestroyingStatus(
endpoint?.replicas ??
endpoint?.desired_session_count,
endpoint?.status,
)
isEndpointInDestroyingCategory(endpoint)
? undefined
: {
color: token.colorError,
Expand Down Expand Up @@ -863,10 +844,7 @@ const EndpointDetailPage: React.FC<EndpointDetailPageProps> = () => {
<Button
type="primary"
icon={<PlusOutlined />}
disabled={isDestroyingStatus(
endpoint?.replicas ?? endpoint?.desired_session_count,
endpoint?.status,
)}
disabled={isEndpointInDestroyingCategory(endpoint)}
onClick={() => {
setIsOpenTokenGenerationModal(true);
}}
Expand Down Expand Up @@ -946,10 +924,7 @@ const EndpointDetailPage: React.FC<EndpointDetailPageProps> = () => {
<Button
icon={<SyncOutlined />}
loading={mutationToSyncRoutes.isPending}
disabled={isDestroyingStatus(
endpoint?.replicas ?? endpoint?.desired_session_count,
endpoint?.status,
)}
disabled={isEndpointInDestroyingCategory(endpoint)}
onClick={() => {
endpoint?.endpoint_id &&
mutationToSyncRoutes.mutateAsync(endpoint?.endpoint_id, {
Expand Down

0 comments on commit 79d34bd

Please sign in to comment.