Rename image creator and image wizard

The names of component and files were not matching
This commit is contained in:
Karel Hala 2021-06-23 14:30:52 +02:00 committed by Sanne Raymaekers
parent 09f467ffb7
commit a01d00c3fe
7 changed files with 23 additions and 20 deletions

View file

@ -106,7 +106,7 @@ const onSave = (values) => {
return requests;
};
const CreateImage = () => {
const CreateImageWizard = () => {
const dispatch = useDispatch();
const history = useHistory();
const [ user, setUser ] = useState();
@ -181,4 +181,4 @@ https://access.redhat.com/documentation/en-us/red_hat_enterprise_linux/8/html/up
} } /> : <Spinner />;
};
export default CreateImage;
export default CreateImageWizard;

View file

@ -11,7 +11,7 @@ import Packages from './formComponents/Packages';
import RadioWithPopover from './formComponents/RadioWithPopover';
import Select from '@data-driven-forms/pf4-component-mapper/select';
const CreateImageWizard = ({ schema, onSubmit, onClose, customComponentMapper, defaultArch, className, ...props }) => {
const ImageCreator = ({ schema, onSubmit, onClose, customComponentMapper, defaultArch, className, ...props }) => {
return schema ? <FormRenderer
schema={ schema }
className={ `image-builder${className ? ` ${className}` : ''}` }
@ -35,7 +35,7 @@ const CreateImageWizard = ({ schema, onSubmit, onClose, customComponentMapper, d
{ ...props } /> : <Spinner />;
};
CreateImageWizard.propTypes = {
ImageCreator.propTypes = {
schema: PropTypes.object,
onSubmit: PropTypes.func.isRequired,
onClose: PropTypes.func.isRequired,
@ -48,4 +48,4 @@ CreateImageWizard.propTypes = {
className: PropTypes.string
};
export default CreateImageWizard;
export default ImageCreator;

View file

@ -0,0 +1,3 @@
.pf-c-dual-list-selector__menu {
--pf-c-dual-list-selector__menu--MinHeight: 20.5rem
}

View file

@ -9,7 +9,7 @@ export default {
customTitle: <Title headingLevel="h1" size="xl">Target Environment - Amazon Web Service</Title>,
name: 'aws-target-env',
substepOf: 'Target environment',
nextStep: ({ values }) => nextStepMapper(values, true),
nextStep: ({ values }) => nextStepMapper(values, { skipAws: true }),
fields: [
{
component: componentTypes.PLAIN_TEXT,

View file

@ -60,7 +60,7 @@ export default {
customTitle: <Title headingLevel="h1" size="xl">Target Environment - Google Cloud Platform</Title>,
name: 'google-cloud-target-env',
substepOf: 'Target environment',
nextStep: ({ values }) => nextStepMapper(values, true, true),
nextStep: ({ values }) => nextStepMapper(values, { skipGoogle: true, skipAws: true }),
fields: [
{
component: componentTypes.PLAIN_TEXT,

View file

@ -25,16 +25,16 @@ export default {
&quot;Contributor&quot; to at least one resource group.<br />
</Text>
<small>
<Button
component="a"
target="_blank"
variant="link"
icon={ <ExternalLinkAltIcon /> }
iconPosition="right"
isInline
href="https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow">
<Button
component="a"
target="_blank"
variant="link"
icon={ <ExternalLinkAltIcon /> }
iconPosition="right"
isInline
href="https://docs.microsoft.com/en-us/azure/active-directory/develop/v2-oauth2-auth-code-flow">
Learn more about OAuth 2.0
</Button>
</Button>
</small>
<a href="https://login.microsoftonline.com/common/oauth2/v2.0/authorize?client_id=b94bb246-b02c-4985-9c22-d44e66f657f4
&scope=openid&response_type=code&response_mode=form_post

View file

@ -1,13 +1,13 @@
export default ({ 'target-environment': targetEnv, release } = {}, skipFirst, skipSecond) => {
if (!skipFirst && targetEnv?.aws) {
export default ({ 'target-environment': targetEnv, release } = {}, { skipAws, skipGoogle, sipAzure } = {}) => {
if (!skipAws && targetEnv?.aws) {
return 'aws-target-env';
}
if (!skipSecond && targetEnv?.google) {
if (!skipGoogle && targetEnv?.google) {
return 'google-cloud-target-env';
}
if (targetEnv?.azure) {
if (!sipAzure && targetEnv?.azure) {
return 'ms-azure-target-env';
}