diff --git a/src/Components/CreateImageWizard/CreateImageWizard.scss b/src/Components/CreateImageWizard/CreateImageWizard.scss index 9c0c093f..ae0cd94c 100644 --- a/src/Components/CreateImageWizard/CreateImageWizard.scss +++ b/src/Components/CreateImageWizard/CreateImageWizard.scss @@ -47,14 +47,6 @@ height: 1em; } -.azureAuthExpandable { - --pf-c-expandable-section__toggle--Color: var(--pf-global--Color--100); - --pf-c-expandable-section__toggle--hover--Color: var(--pf-global--Color--100); - --pf-c-expandable-section__toggle--active--Color: var(--pf-global--Color--100); - --pf-c-expandable-section__toggle--focus--Color: var(--pf-global--Color--100); - --pf-c-expandable-section__toggle--m-expanded--Color: var(--pf-global--Color--100); -} - .pf-c-select__menu-item.pf-m-load { --pf-c-select__menu-item--Color: var(--pf-global--Color--100); } diff --git a/src/Components/CreateImageWizard/ImageCreator.js b/src/Components/CreateImageWizard/ImageCreator.js index c0549c4f..8730fc16 100644 --- a/src/Components/CreateImageWizard/ImageCreator.js +++ b/src/Components/CreateImageWizard/ImageCreator.js @@ -9,7 +9,6 @@ import TargetEnvironment from './formComponents/TargetEnvironment'; import Packages from './formComponents/Packages'; import RadioWithPopover from './formComponents/RadioWithPopover'; import AzureAuthButton from './formComponents/AzureAuthButton'; -import AzureAuthExpandable from './formComponents/AzureAuthExpandable'; import ActivationKeys from './formComponents/ActivationKeys'; import Select from '@data-driven-forms/pf4-component-mapper/select'; import FileSystemConfiguration from './formComponents/FileSystemConfiguration'; @@ -48,7 +47,6 @@ const ImageCreator = ({ defaultArch, }, 'radio-popover': RadioWithPopover, - 'azure-auth-expandable': AzureAuthExpandable, 'azure-auth-button': AzureAuthButton, 'activation-keys': ActivationKeys, 'file-system-config-toggle': FileSystemConfigToggle, diff --git a/src/Components/CreateImageWizard/formComponents/AzureAuthExpandable.js b/src/Components/CreateImageWizard/formComponents/AzureAuthExpandable.js deleted file mode 100644 index 45312e13..00000000 --- a/src/Components/CreateImageWizard/formComponents/AzureAuthExpandable.js +++ /dev/null @@ -1,43 +0,0 @@ -import React, { useState } from 'react'; -import { Button, ExpandableSection, Text, Title } from '@patternfly/react-core'; -import { ExternalLinkAltIcon } from '@patternfly/react-icons'; - -const AzureAuthExpandable = () => { - const [expanded, setExpanded] = useState(true); - - return ( - <> - Authorizing an Azure account - } - onToggle={() => setExpanded(!expanded)} - isExpanded={expanded} - > - - To authorize Image Builder to push images to Microsoft Azure, the - account owner must configure Image Builder as an authorized - application for a specific tenant ID and give it the role of - "Contributor" to at least one resource group. -
-
- - - -
- - ); -}; - -export default AzureAuthExpandable; diff --git a/src/Components/CreateImageWizard/steps/msAzure.js b/src/Components/CreateImageWizard/steps/msAzure.js index 88672097..6ae909ce 100644 --- a/src/Components/CreateImageWizard/steps/msAzure.js +++ b/src/Components/CreateImageWizard/steps/msAzure.js @@ -1,7 +1,8 @@ import React from 'react'; import componentTypes from '@data-driven-forms/react-form-renderer/component-types'; import validatorTypes from '@data-driven-forms/react-form-renderer/validator-types'; -import { Title, Text } from '@patternfly/react-core'; +import { Title, Text, Button, TextContent } from '@patternfly/react-core'; +import { ExternalLinkAltIcon } from '@patternfly/react-icons'; import nextStepMapper from './imageOutputStepMapper'; import StepTemplate from './stepTemplate'; @@ -27,26 +28,31 @@ export default { component: componentTypes.PLAIN_TEXT, name: 'azure-description', label: ( - - Image Builder sends an image to an authorized Azure account. - - ), - }, - { - component: 'azure-auth-expandable', - name: 'azure-auth-expandable', - }, - { - component: componentTypes.PLAIN_TEXT, - name: 'azure-destination', - label: ( - <> - Destination + - Your image will be uploaded to the resource group in the - subscription you specify. + Upon build, Image Builder sends the image to the selected authorized + Azure account. The image will be uploaded to the resource group in + the subscription you specify. - + + To authorize Image Builder to push images to Microsoft Azure, the + account owner must configure Image Builder as an authorized + application for a specific tenant ID and give it the role of + "Contributor" to at least one resource group. +
+ +
+
), }, { @@ -55,7 +61,7 @@ export default { className: 'pf-u-w-50', 'data-testid': 'azure-tenant-id', type: 'text', - label: 'Tenant ID', + label: 'Azure Tenant GUID', required: true, isRequired: true, autoFocus: true,