Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fxi(FR-423): Unkown image error in Image list's control modal #3064

Merged
merged 1 commit into from
Jan 23, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions react/src/components/ImageList.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,8 @@ const ImageList: React.FC<{ style?: React.CSSProperties }> = ({ style }) => {
value
}
version @since(version: "24.12.0")
...ManageImageResourceLimitModal_image
...ManageAppsModal_image
}
}
`,
Expand Down Expand Up @@ -573,7 +575,7 @@ const ImageList: React.FC<{ style?: React.CSSProperties }> = ({ style }) => {
updateEnvironmentFetchKey();
});
}}
image={managingResourceLimit}
imageFrgmt={managingResourceLimit}
/>
<ManageAppsModal
open={!!managingApp}
Expand All @@ -584,7 +586,7 @@ const ImageList: React.FC<{ style?: React.CSSProperties }> = ({ style }) => {
updateEnvironmentFetchKey();
});
}}
image={managingApp}
imageFrgmt={managingApp}
/>
<ImageInstallModal
open={isOpenInstallModal}
Expand Down
28 changes: 23 additions & 5 deletions react/src/components/ManageAppsModal.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import { useSuspendedBackendaiClient } from '../hooks';
import BAIModal, { BAIModalProps } from './BAIModal';
import Flex from './Flex';
import { EnvironmentImage } from './ImageList';
import { ManageAppsModalMutation } from './__generated__/ManageAppsModalMutation.graphql';
import { ManageAppsModal_image$key } from './__generated__/ManageAppsModal_image.graphql';
import { DeleteOutlined, PlusOutlined } from '@ant-design/icons';
import {
Input,
Expand All @@ -18,19 +18,19 @@ import graphql from 'babel-plugin-relay/macro';
import _ from 'lodash';
import React from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useMutation } from 'react-relay';
import { useFragment, useMutation } from 'react-relay';

interface ManageAppsModalProps extends BAIModalProps {
open: boolean;
image: EnvironmentImage | null;
imageFrgmt: ManageAppsModal_image$key | null;
onRequestClose: (success: boolean) => void;
}

type ServicePort = { app: string; protocol: string; port: number };

const ManageAppsModal: React.FC<ManageAppsModalProps> = ({
open,
image,
imageFrgmt,
onRequestClose,
...baiModalProps
}) => {
Expand All @@ -41,6 +41,24 @@ const ManageAppsModal: React.FC<ManageAppsModalProps> = ({

const { token } = theme.useToken();

const image = useFragment(
graphql`
fragment ManageAppsModal_image on Image {
labels {
key
value
}
registry
name @deprecatedSince(version: "24.12.0")
namespace @since(version: "24.12.0")
architecture
installed
tag
}
`,
imageFrgmt,
);

const [commitModifyImageInput, isInFlightModifyImageInput] =
useMutation<ManageAppsModalMutation>(graphql`
mutation ManageAppsModalMutation(
Expand Down Expand Up @@ -109,7 +127,7 @@ const ManageAppsModal: React.FC<ManageAppsModalProps> = ({
const commitRequest = () =>
commitModifyImageInput({
variables: {
target: `${image?.registry}/${image?.name}:${image?.tag}`,
target: `${image?.registry}/${image?.name ?? image.namespace}:${image?.tag}`,
architecture: image?.architecture,
props: {
labels: labels,
Expand Down
29 changes: 24 additions & 5 deletions react/src/components/ManageImageResourceLimitModal.tsx
Original file line number Diff line number Diff line change
@@ -1,26 +1,26 @@
import { useSuspendedBackendaiClient } from '../hooks';
import BAIModal, { BAIModalProps } from './BAIModal';
import { EnvironmentImage } from './ImageList';
import ImageResourceFormItem from './ImageResourceFormItem';
import {
ManageImageResourceLimitModalMutation,
ResourceLimitInput,
} from './__generated__/ManageImageResourceLimitModalMutation.graphql';
import { ManageImageResourceLimitModal_image$key } from './__generated__/ManageImageResourceLimitModal_image.graphql';
import { App, Form, FormInstance, message } from 'antd';
import graphql from 'babel-plugin-relay/macro';
import _ from 'lodash';
import React, { useRef } from 'react';
import { Trans, useTranslation } from 'react-i18next';
import { useMutation } from 'react-relay';
import { useFragment, useMutation } from 'react-relay';

interface ManageImageResourceLimitModalProps extends BAIModalProps {
image: EnvironmentImage | null;
imageFrgmt: ManageImageResourceLimitModal_image$key | null;
open: boolean;
onRequestClose: (success: boolean) => void;
}
const ManageImageResourceLimitModal: React.FC<
ManageImageResourceLimitModalProps
> = ({ image, open, onRequestClose, ...BAIModalProps }) => {
> = ({ imageFrgmt, open, onRequestClose, ...BAIModalProps }) => {
const baiClient = useSuspendedBackendaiClient();
// Differentiate default max value based on manager version.
// The difference between validating a variable type as undefined or none for an unsupplied field value.
Expand All @@ -30,6 +30,25 @@ const ManageImageResourceLimitModal: React.FC<
const formRef = useRef<FormInstance>(null);
const app = App.useApp();

const image = useFragment(
graphql`
fragment ManageImageResourceLimitModal_image on Image {
resource_limits {
key
min
max
}
registry
name @deprecatedSince(version: "24.12.0")
namespace @since(version: "24.12.0")
architecture
installed
tag
}
`,
imageFrgmt,
);

const [commitModifyImageInput, isInFlightModifyImageInput] =
useMutation<ManageImageResourceLimitModalMutation>(graphql`
mutation ManageImageResourceLimitModalMutation(
Expand Down Expand Up @@ -65,7 +84,7 @@ const ManageImageResourceLimitModal: React.FC<
const commitRequest = () =>
commitModifyImageInput({
variables: {
target: `${image?.registry}/${image?.name}:${image?.tag}`,
target: `${image?.registry}/${image?.name ?? image?.namespace}:${image?.tag}`,
architecture: image?.architecture,
props: {
resource_limits,
Expand Down
Loading