feat(HMS-2255): deploy to image RG by default

src/Components/AzureResourceGroup/AzureResourceGroup.test.js

@@ -6,6 +6,11 @@ import { azureSourceUploadInfo } from '../../mocks/fixtures/sources.fixtures';
 import AzureResourceGroup from '.';
 
 describe('AzureResourceGroup', () => {
+  test('set the image resource group as placeholder to inform user', async () => {
+    const rgSelect = await mountSelectAndOpen('Image RG');
+    expect(rgSelect).toHaveAttribute('placeholder', 'Image RG (default - image resource group)');
+  });
+
   test('populate resource group select', async () => {
     await mountSelectAndOpen();
     const items = await screen.findAllByLabelText(/^Resource group/);
@@ -29,8 +34,8 @@ describe('AzureResourceGroup', () => {
   });
 });
 
-const mountSelectAndOpen = async () => {
-  render(<AzureResourceGroup />, {
+const mountSelectAndOpen = async (imageResourceGroup = null) => {
+  render(<AzureResourceGroup imageResourceGroup={imageResourceGroup} />, {
     contextValues: { chosenSource: '66' },
   });
   const selectDropdown = await screen.findByLabelText('Select resource group');

src/Components/AzureResourceGroup/index.js

@@ -1,3 +1,4 @@
+import PropTypes from 'prop-types';
 import React from 'react';
 
 import { Spinner, Select, SelectOption, TextInput } from '@patternfly/react-core';
@@ -6,7 +7,7 @@ import { AZURE_RG_KEY } from '../../API/queryKeys';
 import { fetchResourceGroups } from '../../API';
 import { useWizardContext } from '../Common/WizardContext';
 
-const AzureResourceGroup = () => {
+const AzureResourceGroup = ({ imageResourceGroup }) => {
   const [isOpen, setIsOpen] = React.useState(false);
   const [{ chosenSource, azureResourceGroup }, setWizardContext] = useWizardContext();
   const [selection, setSelection] = React.useState(azureResourceGroup);
@@ -84,15 +85,23 @@ const AzureResourceGroup = () => {
       isOpen={isOpen}
       onClear={clearSelection}
       selections={selection}
-      placeholderText="redhat-deployed (default)"
+      placeholderText={`${imageResourceGroup} (default - image resource group)`}
       typeAheadAriaLabel="Select resource group"
       maxHeight="220px"
     >
-      {resourceGroups.map((name, idx) => (
+      {(resourceGroups || [selection]).map((name, idx) => (
         <SelectOption aria-label={`Resource group ${name}`} key={idx} value={name} />
       ))}
     </Select>
   );
 };
 
+AzureResourceGroup.propTypes = {
+  imageResourceGroup: PropTypes.string,
+};
+
+AzureResourceGroup.defaultProps = {
+  imageResourceGroup: null,
+};
+
 export default AzureResourceGroup;

src/Components/LaunchDescriptionList/index.js

@@ -1,7 +1,7 @@
-import PropTypes from 'prop-types';
 import React from 'react';
 import { ExpandableSection, DescriptionList, DescriptionListTerm, DescriptionListGroup, DescriptionListDescription } from '@patternfly/react-core';
 
+import { imageProps, imageAzureResourceGroup } from '../ProvisioningWizard/helpers';
 import { useSourcesData } from '../Common/Hooks/sources';
 import { useWizardContext } from '../Common/WizardContext';
 import { instanceType, region } from '../ProvisioningWizard/steps/ReservationProgress/helpers';
@@ -11,7 +11,7 @@ import { humanizeProvider } from '../Common/helpers';
 import { TEMPLATES_KEY } from '../../API/queryKeys';
 import { AZURE_PROVIDER } from '../../constants';
 
-const LaunchDescriptionList = ({ imageName }) => {
+const LaunchDescriptionList = ({ image }) => {
   const [
     {
       chosenRegion,
@@ -47,16 +47,16 @@ const LaunchDescriptionList = ({ imageName }) => {
       <DescriptionList isHorizontal>
         <DescriptionListGroup>
           <DescriptionListTerm>Image</DescriptionListTerm>
-          <DescriptionListDescription>{imageName}</DescriptionListDescription>
+          <DescriptionListDescription>{image.name}</DescriptionListDescription>
         </DescriptionListGroup>
         <DescriptionListGroup>
           <DescriptionListTerm>Account</DescriptionListTerm>
           <DescriptionListDescription>{getChosenSourceName()}</DescriptionListDescription>
         </DescriptionListGroup>
-        {provider === AZURE_PROVIDER && azureResourceGroup && (
+        {provider === AZURE_PROVIDER && (
           <DescriptionListGroup>
             <DescriptionListTerm>Resource group</DescriptionListTerm>
-            <DescriptionListDescription>{azureResourceGroup}</DescriptionListDescription>
+            <DescriptionListDescription>{azureResourceGroup || <i>{imageAzureResourceGroup(image)}</i>}</DescriptionListDescription>
           </DescriptionListGroup>
         )}
         <DescriptionListGroup>
@@ -87,6 +87,6 @@ const LaunchDescriptionList = ({ imageName }) => {
 };
 
 LaunchDescriptionList.propTypes = {
-  imageName: PropTypes.string.isRequired,
+  image: imageProps,
 };
 export default LaunchDescriptionList;

src/Components/ProvisioningWizard/helpers.js

@@ -10,3 +10,5 @@ export const imageProps = PropTypes.shape({
   sourceIDs: PropTypes.arrayOf(PropTypes.string),
   accountIDs: PropTypes.arrayOf(PropTypes.string),
 }).isRequired;
+
+export const imageAzureResourceGroup = (image) => image.uploadOptions?.resource_group;

src/Components/ProvisioningWizard/steps/AccountCustomizations/azure.js

@@ -3,17 +3,15 @@ import React from 'react';
 import { Form, FormGroup, Popover, Title, Button, Text } from '@patternfly/react-core';
 import { HelpIcon } from '@patternfly/react-icons';
 
-import { AZURE_PROVIDER } from '../../../../constants';
-import { imageProps } from '../../helpers';
+import { imageProps, imageAzureResourceGroup } from '../../helpers';
 import SourcesSelect from '../../../SourcesSelect';
 import InstanceCounter from '../../../InstanceCounter';
 import InstanceTypesSelect from '../../../InstanceTypesSelect';
-import RegionsSelect from '../../../RegionsSelect';
 import AzureResourceGroup from '../../../AzureResourceGroup';
 import { useWizardContext } from '../../../Common/WizardContext';
 
 const AccountCustomizationsAzure = ({ setStepValidated, image }) => {
-  const [wizardContext, setWizardContext] = useWizardContext();
+  const [wizardContext] = useWizardContext();
   const [validations, setValidation] = React.useState({
     sources: wizardContext.chosenSource ? 'success' : 'default',
     types: wizardContext.chosenInstanceType ? 'success' : 'default',
@@ -26,14 +24,6 @@ const AccountCustomizationsAzure = ({ setStepValidated, image }) => {
     setStepValidated(!errorExists);
   }, [validations]);
 
-  const onRegionChange = ({ region, imageID }) => {
-    setWizardContext((prevState) => ({
-      ...prevState,
-      chosenRegion: region,
-      chosenImageID: imageID,
-    }));
-  };
-
   return (
     <Form>
       <Title ouiaId="account_custom_title" headingLevel="h1" size="xl">
@@ -56,35 +46,18 @@ const AccountCustomizationsAzure = ({ setStepValidated, image }) => {
           }
         />
       </FormGroup>
-      <FormGroup
-        label="Select location"
-        isRequired
-        fieldId="azure-select-location"
-        labelIcon={
-          <Popover headerContent={<div>Azure locations</div>}>
-            <Button
-              ouiaId="location_help"
-              type="button"
-              aria-label="More info for location field"
-              onClick={(e) => e.preventDefault()}
-              aria-describedby="azure-select-location"
-              className="pf-c-form__group-label-help"
-              variant="plain"
-            >
-              <HelpIcon noVerticalAlign />
-            </Button>
-          </Popover>
-        }
-      >
-        <RegionsSelect provider={AZURE_PROVIDER} currentRegion={wizardContext.chosenRegion} onChange={onRegionChange} composeID={image.id} />
-      </FormGroup>
       <FormGroup
         label="Azure resource group"
         fieldId="azure-resource-group-select"
         labelIcon={
           <Popover
             headerContent={<div>Azure resource group</div>}
-            bodyContent={<div>Azure resource group to deploy the VM resources into. If left blank, defaults to &lsquo;redhat-deployed&rsquo;.</div>}
+            bodyContent={
+              <div>
+                <p>Azure resource group to deploy the VM resources into. Defaults to the resource group image is located in.</p>
+                <p>The location (Azure region) of the resource group is used for all resources deployed.</p>
+              </div>
+            }
           >
             <Button
               ouiaId="resource_group_help"
@@ -100,7 +73,7 @@ const AccountCustomizationsAzure = ({ setStepValidated, image }) => {
           </Popover>
         }
       >
-        <AzureResourceGroup />
+        <AzureResourceGroup imageResourceGroup={imageAzureResourceGroup(image)} />
       </FormGroup>
       <FormGroup
         label="Select instance size"

src/Components/ProvisioningWizard/steps/ReviewDetails/index.js

@@ -1,10 +1,11 @@
-import PropTypes from 'prop-types';
 import React from 'react';
+
+import { imageProps } from '../../helpers';
 import { Title, Text, Alert, AlertActionLink } from '@patternfly/react-core';
 import LaunchDescriptionList from '../../../LaunchDescriptionList';
 import useLocalStorage from '../../../Common/Hooks/useLocalStorage';
 
-const ReviewDetails = ({ imageName }) => {
+const ReviewDetails = ({ image }) => {
   const [showNotificationBanner, setNotificationBanner] = useLocalStorage('rh_launch_notification_banner', true);
 
   return (
@@ -46,12 +47,12 @@ const ReviewDetails = ({ imageName }) => {
           </>
         </Alert>
       )}
-      <LaunchDescriptionList imageName={imageName} />
+      <LaunchDescriptionList image={image} />
     </div>
   );
 };
 
 ReviewDetails.propTypes = {
-  imageName: PropTypes.string.isRequired,
+  image: imageProps,
 };
 export default ReviewDetails;

src/Components/ProvisioningWizard/steps/index.js

@@ -78,7 +78,7 @@ const wizardSteps = ({ stepIdReached, image, stepValidation, setStepValidation,
     id: 5,
     component: (
       <Loader>
-        <ReviewDetails imageName={image.name} />
+        <ReviewDetails image={image} />
       </Loader>
     ),
     canJumpTo: stepIdReached >= 5,