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.

Sign up for GitHub

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

Jump to bottom

Bug 1834409: Fix alert msg when image is detected but has no builder image #5390

Merged
merged 1 commit into from May 14, 2020
Merged

Bug 1834409: Fix alert msg when image is detected but has no builder image #5390

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
18 changes: 8 additions & 10 deletions frontend/packages/dev-console/src/components/import/builder/BuilderImageSelector.tsx
View file
Open in desktop
Expand Up @@ -17,16 +17,14 @@ const BuilderImageSelector: React.FC<BuilderImageSelectorProps> = ({
builderImages,
}) => {
const { values, setFieldValue, setFieldTouched } = useFormikContext<FormikValues>();
const { selected, recommended, isRecommending, couldNotRecommend } = values.image;

React.useEffect(() => {
if (values.image.selected) {
setFieldValue(
'image.tag',
_.get(builderImages, `${values.image.selected}.recentTag.name`, ''),
);
if (selected) {
setFieldValue('image.tag', _.get(builderImages, `${selected}.recentTag.name`, ''));
setFieldTouched('image.tag', true);
}
}, [values.image.selected, setFieldValue, setFieldTouched, builderImages]);
}, [selected, setFieldValue, setFieldTouched, builderImages]);

const fieldId = getFieldId('image.name', 'selector');

Expand All @@ -36,19 +34,19 @@ const BuilderImageSelector: React.FC<BuilderImageSelectorProps> = ({
itemList={builderImages}
name="image.selected"
loadingItems={loadingImageStream}
recommended={values.image.recommended}
recommended={recommended}
/>
);
}

return (
<FormGroup fieldId={fieldId} label="Builder Image">
{values.image.isRecommending && (
{isRecommending && (
<>
<LoadingInline /> Detecting recommended builder images...
</>
)}
{values.image.recommended && (
{recommended && builderImages.hasOwnProperty(recommended) && (
<>
<Alert variant="success" title="Builder image(s) detected." isInline>
Recommended builder images are represented by{' '}
Expand All @@ -57,7 +55,7 @@ const BuilderImageSelector: React.FC<BuilderImageSelectorProps> = ({
<br />
</>
)}
{values.image.couldNotRecommend && (
{(couldNotRecommend || (recommended && !builderImages.hasOwnProperty(recommended))) && (
<>
<Alert variant="warning" title="Unable to detect the builder image." isInline>
Select the most appropriate one from the list to continue.
Expand Down