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

[release-4.9] Bug 2036859: Shift invalid devfile alert down #10766

Merged
merged 1 commit into from
Jan 24, 2022
Merged

[release-4.9] Bug 2036859: Shift invalid devfile alert down #10766

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
7 changes: 7 additions & 0 deletions frontend/packages/dev-console/src/components/import/devfile/DevfileStrategySection.scss
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
.odc-devfile-strategy-section {
&__error-alert {
// Extra margin to offset strategy selector button overlap
// at .odc-import-strategy-section__strategy-selector
margin: 3.2em 0;
}
}
14 changes: 11 additions & 3 deletions frontend/packages/dev-console/src/components/import/devfile/DevfileStrategySection.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import { safeYAMLToJS } from '@console/shared/src/utils/yaml';
import FormSection from '../section/FormSection';
import { useDevfileServer, useDevfileSource, useSelectedDevfileSample } from './devfileHooks';
import DevfileInfo from './DevfileInfo';
import './DevfileStrategySection.scss';

const DevfileStrategySection: React.FC = () => {
const { t } = useTranslation();
Expand Down Expand Up @@ -93,9 +94,16 @@ const DevfileStrategySection: React.FC = () => {
return (
<>
{devfileParseError && (
<Alert isInline variant="danger" title={t('devconsole~Import is not possible.')}>
{devfileParseError}
</Alert>
<FormSection>
<Alert
isInline
className="odc-devfile-strategy-section__error-alert"
variant="danger"
title={t('devconsole~Import is not possible.')}
>
{devfileParseError}
</Alert>
</FormSection>
)}
{showEditImportStrategy && importType !== 'devfile' && (
<FormSection>
Expand Down