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 1787492: fix(deployimage-status) fix external registry error message #4073

Merged
merged 1 commit into from
Jan 31, 2020
Merged

Bug 1787492: fix(deployimage-status) fix external registry error message #4073

Show file tree
Hide file tree
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
8 changes: 4 additions & 4 deletions frontend/packages/dev-console/src/components/import/image-search/ImageSearch.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import { getSuggestedName, getPorts, makePortName } from '../../../utils/imagest
import { secretModalLauncher } from '../CreateSecretModal';

const ImageSearch: React.FC = () => {
const { values, setFieldValue, setFieldError, dirty } = useFormikContext<FormikValues>();
const { values, setFieldValue, dirty } = useFormikContext<FormikValues>();
const [newImageSecret, setNewImageSecret] = React.useState('');
const [alertVisible, shouldHideAlert] = React.useState(true);
const namespace = values.project.name;
Expand Down Expand Up @@ -64,17 +64,17 @@ const ImageSearch: React.FC = () => {
} else {
setFieldValue('isSearchingForImage', false);
setFieldValue('isi', {});
setFieldError('isi.image', status.message);
setFieldValue('isi.status', status.message);
setFieldValue('route.targetPort', null);
}
})
.catch((error) => {
setFieldError('isi.image', error.message);
setFieldValue('isi', {});
setFieldValue('isi.status', error.message);
setFieldValue('isSearchingForImage', false);
});
},
[setFieldError, setFieldValue, values.application.name, values.name, values.project.name],
[setFieldValue, values.application.name, values.name, values.project.name],
);

const handleSave = (name: string) => {
Expand Down
3 changes: 2 additions & 1 deletion frontend/packages/dev-console/src/components/import/image-search/SearchStatus.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import { RedExclamationCircleIcon } from '@console/shared';
const SearchStatus: React.FC = () => {
const { values, errors } = useFormikContext<FormikValues>();
const isiError = _.get(errors, 'isi.image');
const isiStatus = values?.isi?.status;

return _.isEmpty(values.isi.image) ? (
<div className="co-image-name-results">
Expand All @@ -22,7 +23,7 @@ const SearchStatus: React.FC = () => {
<h2 className="h3 co-image-name-results__loading-heading">
<RedExclamationCircleIcon /> Could not load image metadata.
</h2>
<p className="co-image-name-results__loading-error">{isiError}</p>
<p className="co-image-name-results__loading-error">{isiStatus || isiError}</p>
</>
)}
</div>
Expand Down