Launch button in stable environments

This moves Beta only features to stable environment: - Sharing Images through Sources - Launch button This tries to avoid any refactoring, just moving components from Beta to stable with minimal changes.
2023-08-15 16:40:53 +02:00 · 2023-08-15 16:40:53 +02:00 · 2a8e5a10df
commit 2a8e5a10df
parent e5575d7a2d
12 changed files with 523 additions and 782 deletions
--- a/src/Components/CreateImageWizard/CreateImageWizard.js
+++ b/src/Components/CreateImageWizard/CreateImageWizard.js
@ -7,14 +7,12 @@ import { useNavigate, useParams } from 'react-router-dom';

 import ImageCreator from './ImageCreator';
 import {
-  awsTargetStable,
-  awsTargetBeta,
+  awsTarget,
  fileSystemConfiguration,
-  googleCloudTarger,
+  googleCloudTarget,
  imageName,
  imageOutput,
-  msAzureTargetStable,
-  msAzureTargetBeta,
+  msAzureTarget,
  packages,
  packagesContentSources,
  registration,
@ -516,8 +514,6 @@ const CreateImageWizard = () => {

  const { isBeta, isProd } = useGetEnvironment();

-  const awsTarget = isBeta() ? awsTargetBeta : awsTargetStable;
-  const msAzureTarget = isBeta() ? msAzureTargetBeta : msAzureTargetStable;
  let initialState = requestToState(
    composeRequest,
    distroInfo,
@ -622,7 +618,7 @@ const CreateImageWizard = () => {
            fields: [
              imageOutput,
              awsTarget,
-              googleCloudTarger,
+              googleCloudTarget,
              msAzureTarget,
              registration,
              packages,
--- a/src/Components/CreateImageWizard/steps/aws.beta.js
+++ b/src/Components/CreateImageWizard/steps/aws.beta.js
@ -1,187 +0,0 @@
-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 {
-  Button,
-  HelperText,
-  HelperTextItem,
-  Title,
-} from '@patternfly/react-core';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
-
-import nextStepMapper from './imageOutputStepMapper';
-import StepTemplate from './stepTemplate';
-
-import { DEFAULT_AWS_REGION } from '../../../constants';
-import CustomButtons from '../formComponents/CustomButtons';
-
-const SourcesButton = () => {
-  return (
-    <Button
-      component="a"
-      target="_blank"
-      variant="link"
-      icon={<ExternalLinkAltIcon />}
-      iconPosition="right"
-      isInline
-      href={'settings/sources'}
-    >
-      Create and manage sources here
-    </Button>
-  );
-};
-
-export default {
-  StepTemplate,
-  id: 'wizard-target-aws',
-  title: 'Amazon Web Services',
-  customTitle: (
-    <Title headingLevel="h1" size="xl">
-      Target environment - Amazon Web Services
-    </Title>
-  ),
-  name: 'aws-target-env',
-  substepOf: 'Target environment',
-  nextStep: ({ values }) => nextStepMapper(values, { skipAws: true }),
-  buttons: CustomButtons,
-  fields: [
-    {
-      component: componentTypes.PLAIN_TEXT,
-      name: 'plain-text-component',
-      label: (
-        <p>
-          Your image will be uploaded to AWS and shared with the account you
-          provide below.
-        </p>
-      ),
-    },
-    {
-      component: componentTypes.PLAIN_TEXT,
-      name: 'plain-text-component',
-      label: (
-        <p>
-          <b>The shared image will expire within 14 days.</b> To permanently
-          access the image, copy the image, which will be shared to your account
-          by Red Hat, to your own AWS account.
-        </p>
-      ),
-    },
-    {
-      component: componentTypes.RADIO,
-      label: 'Share method:',
-      name: 'aws-target-type',
-      initialValue: 'aws-target-type-source',
-      autoFocus: true,
-      options: [
-        {
-          label: 'Use an account configured from Sources.',
-          description:
-            'Use a configured source to launch environments directly from the console.',
-          value: 'aws-target-type-source',
-          'data-testid': 'aws-radio-source',
-          autoFocus: true,
-        },
-        {
-          label: 'Manually enter an account ID.',
-          value: 'aws-target-type-account-id',
-          'data-testid': 'aws-radio-account-id',
-          className: 'pf-u-mt-sm',
-        },
-      ],
-    },
-    {
-      component: 'aws-sources-select',
-      name: 'aws-sources-select',
-      className: 'pf-u-max-width',
-      label: 'Source Name',
-      isRequired: true,
-      validate: [
-        {
-          type: validatorTypes.REQUIRED,
-        },
-      ],
-      condition: {
-        when: 'aws-target-type',
-        is: 'aws-target-type-source',
-      },
-    },
-    {
-      component: componentTypes.PLAIN_TEXT,
-      name: 'aws-sources-select-description',
-      label: <SourcesButton />,
-      condition: {
-        when: 'aws-target-type',
-        is: 'aws-target-type-source',
-      },
-    },
-    {
-      component: componentTypes.TEXT_FIELD,
-      name: 'aws-account-id',
-      className: 'pf-u-w-25',
-      'data-testid': 'aws-account-id',
-      type: 'text',
-      label: 'AWS account ID',
-      isRequired: true,
-      validate: [
-        {
-          type: validatorTypes.REQUIRED,
-        },
-        {
-          type: validatorTypes.EXACT_LENGTH,
-          threshold: 12,
-        },
-      ],
-      condition: {
-        when: 'aws-target-type',
-        is: 'aws-target-type-account-id',
-      },
-    },
-    {
-      name: 'gallery-layout',
-      component: 'gallery-layout',
-      minWidths: { default: '12.5rem' },
-      maxWidths: { default: '12.5rem' },
-      fields: [
-        {
-          component: componentTypes.TEXT_FIELD,
-          name: 'aws-default-region',
-          value: DEFAULT_AWS_REGION,
-          'data-testid': 'aws-default-region',
-          type: 'text',
-          label: 'Default Region',
-          isReadOnly: true,
-          isRequired: true,
-          helperText: (
-            <HelperText>
-              <HelperTextItem component="div" variant="indeterminate">
-                Images are built in the default region but can be copied to
-                other regions later.
-              </HelperTextItem>
-            </HelperText>
-          ),
-        },
-        {
-          component: componentTypes.TEXT_FIELD,
-          name: 'aws-associated-account-id',
-          'data-testid': 'aws-associated-account-id',
-          type: 'text',
-          label: 'Associated Account ID',
-          isReadOnly: true,
-          isRequired: true,
-          helperText: (
-            <HelperText>
-              <HelperTextItem component="div" variant="indeterminate">
-                This is the account associated with the source.
-              </HelperTextItem>
-            </HelperText>
-          ),
-          condition: {
-            when: 'aws-target-type',
-            is: 'aws-target-type-source',
-          },
-        },
-      ],
-    },
-  ],
-};
--- a/src/Components/CreateImageWizard/steps/aws.js
+++ b/src/Components/CreateImageWizard/steps/aws.js
@ -2,7 +2,13 @@ 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 { HelperText, HelperTextItem, Title } from '@patternfly/react-core';
+import {
+  Button,
+  HelperText,
+  HelperTextItem,
+  Title,
+} from '@patternfly/react-core';
+import { ExternalLinkAltIcon } from '@patternfly/react-icons';

 import nextStepMapper from './imageOutputStepMapper';
 import StepTemplate from './stepTemplate';
@ -10,6 +16,22 @@ import StepTemplate from './stepTemplate';
 import { DEFAULT_AWS_REGION } from '../../../constants';
 import CustomButtons from '../formComponents/CustomButtons';

+const SourcesButton = () => {
+  return (
+    <Button
+      component="a"
+      target="_blank"
+      variant="link"
+      icon={<ExternalLinkAltIcon />}
+      iconPosition="right"
+      isInline
+      href={'settings/sources'}
+    >
+      Create and manage sources here
+    </Button>
+  );
+};
+
 export default {
  StepTemplate,
  id: 'wizard-target-aws',
@ -45,6 +67,54 @@ export default {
        </p>
      ),
    },
+    {
+      component: componentTypes.RADIO,
+      label: 'Share method:',
+      name: 'aws-target-type',
+      initialValue: 'aws-target-type-source',
+      autoFocus: true,
+      options: [
+        {
+          label: 'Use an account configured from Sources.',
+          description:
+            'Use a configured source to launch environments directly from the console.',
+          value: 'aws-target-type-source',
+          'data-testid': 'aws-radio-source',
+          autoFocus: true,
+        },
+        {
+          label: 'Manually enter an account ID.',
+          value: 'aws-target-type-account-id',
+          'data-testid': 'aws-radio-account-id',
+          className: 'pf-u-mt-sm',
+        },
+      ],
+    },
+    {
+      component: 'aws-sources-select',
+      name: 'aws-sources-select',
+      className: 'pf-u-max-width',
+      label: 'Source Name',
+      isRequired: true,
+      validate: [
+        {
+          type: validatorTypes.REQUIRED,
+        },
+      ],
+      condition: {
+        when: 'aws-target-type',
+        is: 'aws-target-type-source',
+      },
+    },
+    {
+      component: componentTypes.PLAIN_TEXT,
+      name: 'aws-sources-select-description',
+      label: <SourcesButton />,
+      condition: {
+        when: 'aws-target-type',
+        is: 'aws-target-type-source',
+      },
+    },
    {
      component: componentTypes.TEXT_FIELD,
      name: 'aws-account-id',
@ -53,7 +123,6 @@ export default {
      type: 'text',
      label: 'AWS account ID',
      isRequired: true,
-      autoFocus: true,
      validate: [
        {
          type: validatorTypes.REQUIRED,
@ -63,29 +132,56 @@ export default {
          threshold: 12,
        },
      ],
+      condition: {
+        when: 'aws-target-type',
+        is: 'aws-target-type-account-id',
+      },
    },
    {
-      component: componentTypes.TEXT_FIELD,
-      name: 'aws-default-region',
-      className: 'pf-u-w-25',
-      'data-testid': 'aws-default-region',
-      type: 'text',
-      label: 'Default Region',
-      value: DEFAULT_AWS_REGION,
-      isReadOnly: true,
-      isRequired: true,
-      helperText: (
-        <HelperText>
-          <HelperTextItem
-            component="div"
-            variant="indeterminate"
-            className="pf-u-w-25"
-          >
-            Images are built in the default region but can be copied to other
-            regions later.
-          </HelperTextItem>
-        </HelperText>
-      ),
+      name: 'gallery-layout',
+      component: 'gallery-layout',
+      minWidths: { default: '12.5rem' },
+      maxWidths: { default: '12.5rem' },
+      fields: [
+        {
+          component: componentTypes.TEXT_FIELD,
+          name: 'aws-default-region',
+          value: DEFAULT_AWS_REGION,
+          'data-testid': 'aws-default-region',
+          type: 'text',
+          label: 'Default Region',
+          isReadOnly: true,
+          isRequired: true,
+          helperText: (
+            <HelperText>
+              <HelperTextItem component="div" variant="indeterminate">
+                Images are built in the default region but can be copied to
+                other regions later.
+              </HelperTextItem>
+            </HelperText>
+          ),
+        },
+        {
+          component: componentTypes.TEXT_FIELD,
+          name: 'aws-associated-account-id',
+          'data-testid': 'aws-associated-account-id',
+          type: 'text',
+          label: 'Associated Account ID',
+          isReadOnly: true,
+          isRequired: true,
+          helperText: (
+            <HelperText>
+              <HelperTextItem component="div" variant="indeterminate">
+                This is the account associated with the source.
+              </HelperTextItem>
+            </HelperText>
+          ),
+          condition: {
+            when: 'aws-target-type',
+            is: 'aws-target-type-source',
+          },
+        },
+      ],
    },
  ],
 };
--- a/src/Components/CreateImageWizard/steps/index.js
+++ b/src/Components/CreateImageWizard/steps/index.js
@ -1,8 +1,6 @@
-export { default as awsTargetStable } from './aws';
-export { default as awsTargetBeta } from './aws.beta';
-export { default as googleCloudTarger } from './googleCloud';
-export { default as msAzureTargetStable } from './msAzure';
-export { default as msAzureTargetBeta } from './msAzure.beta';
+export { default as awsTarget } from './aws';
+export { default as googleCloudTarget } from './googleCloud';
+export { default as msAzureTarget } from './msAzure';
 export { default as packages } from './packages';
 export { default as packagesContentSources } from './packagesContentSources';
 export { default as registration } from './registration';
--- a/src/Components/CreateImageWizard/steps/msAzure.beta.js
+++ b/src/Components/CreateImageWizard/steps/msAzure.beta.js
@ -1,262 +0,0 @@
-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 { Button, Text, TextContent, Title } from '@patternfly/react-core';
-import { ExternalLinkAltIcon } from '@patternfly/react-icons';
-
-import nextStepMapper from './imageOutputStepMapper';
-import StepTemplate from './stepTemplate';
-
-import CustomButtons from '../formComponents/CustomButtons';
-
-const SourcesButton = () => {
-  return (
-    <Button
-      component="a"
-      target="_blank"
-      variant="link"
-      icon={<ExternalLinkAltIcon />}
-      iconPosition="right"
-      isInline
-      href={'settings/sources'}
-    >
-      Create and manage sources here
-    </Button>
-  );
-};
-
-export default {
-  StepTemplate,
-  id: 'wizard-target-msazure',
-  title: 'Microsoft Azure',
-  customTitle: (
-    <Title headingLevel="h1" size="xl">
-      Target environment - Microsoft Azure
-    </Title>
-  ),
-  name: 'ms-azure-target-env',
-  substepOf: 'Target environment',
-  nextStep: ({ values }) =>
-    nextStepMapper(values, {
-      skipAws: true,
-      skipGoogle: true,
-      skipAzure: true,
-    }),
-  buttons: CustomButtons,
-  fields: [
-    {
-      component: componentTypes.PLAIN_TEXT,
-      name: 'azure-description',
-      label: (
-        <TextContent>
-          <Text>
-            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.
-          </Text>
-          <Text>
-            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
-            &quot;Contributor&quot; for the resource group you want to upload
-            to. This applies even when defining target by Source selection.
-            <br />
-            <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>
-          </Text>
-        </TextContent>
-      ),
-    },
-    {
-      component: componentTypes.RADIO,
-      label: 'Share method:',
-      name: 'azure-type',
-      initialValue: 'azure-type-source',
-      autoFocus: true,
-      options: [
-        {
-          label: 'Use an account configured from Sources.',
-          description:
-            'Use a configured source to launch environments directly from the console.',
-          value: 'azure-type-source',
-          'data-testid': 'azure-radio-source',
-          autoFocus: true,
-        },
-        {
-          label: 'Manually enter the account information.',
-          value: 'azure-type-manual',
-          'data-testid': 'azure-radio-manual',
-          className: 'pf-u-mt-sm',
-        },
-      ],
-    },
-    {
-      component: 'azure-sources-select',
-      name: 'azure-sources-select',
-      className: 'pf-u-max-width',
-      label: 'Source Name',
-      isRequired: true,
-      validate: [
-        {
-          type: validatorTypes.REQUIRED,
-        },
-      ],
-      condition: {
-        when: 'azure-type',
-        is: 'azure-type-source',
-      },
-    },
-    {
-      component: componentTypes.PLAIN_TEXT,
-      name: 'azure-sources-select-description',
-      label: <SourcesButton />,
-      condition: {
-        when: 'azure-type',
-        is: 'azure-type-source',
-      },
-    },
-    {
-      name: 'gallery-layout',
-      component: 'gallery-layout',
-      minWidths: { default: '12.5rem' },
-      maxWidths: { default: '12.5rem' },
-      fields: [
-        {
-          component: componentTypes.TEXT_FIELD,
-          name: 'azure-tenant-id',
-          'data-testid': 'azure-tenant-id-source',
-          type: 'text',
-          label: 'Azure Tenant GUID',
-          isRequired: true,
-          isReadOnly: true,
-        },
-        {
-          component: componentTypes.TEXT_FIELD,
-          name: 'azure-subscription-id',
-          'data-testid': 'azure-subscription-id-source',
-          type: 'text',
-          label: 'Subscription ID',
-          isRequired: true,
-          isReadOnly: true,
-          condition: {
-            when: 'azure-type',
-            is: 'azure-type-source',
-          },
-        },
-      ],
-      condition: {
-        when: 'azure-type',
-        is: 'azure-type-source',
-      },
-    },
-    {
-      component: componentTypes.TEXT_FIELD,
-      name: 'azure-tenant-id',
-      className: 'pf-u-w-50',
-      'data-testid': 'azure-tenant-id-manual',
-      type: 'text',
-      label: 'Azure Tenant GUID',
-      isRequired: true,
-      autoFocus: true,
-      validate: [
-        {
-          type: validatorTypes.REQUIRED,
-        },
-        {
-          type: validatorTypes.PATTERN,
-          pattern:
-            /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i,
-          message: 'Please enter a valid tenant ID',
-        },
-      ],
-      condition: {
-        when: 'azure-type',
-        is: 'azure-type-manual',
-      },
-    },
-    {
-      component: 'azure-auth-button',
-      name: 'azure-auth-button',
-      'data-testid': 'azure-auth-button',
-      required: true,
-      isRequired: true,
-    },
-    {
-      component: componentTypes.TEXT_FIELD,
-      name: 'azure-subscription-id',
-      className: 'pf-u-w-50',
-      'data-testid': 'azure-subscription-id-manual',
-      type: 'text',
-      label: 'Subscription ID',
-      isRequired: true,
-      validate: [
-        {
-          type: validatorTypes.REQUIRED,
-        },
-        {
-          type: validatorTypes.PATTERN,
-          pattern:
-            /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/i,
-          message: 'Please enter a valid subscription ID',
-        },
-      ],
-      condition: {
-        when: 'azure-type',
-        is: 'azure-type-manual',
-      },
-    },
-    {
-      component: 'azure-resource-groups',
-      name: 'azure-resource-group',
-      className: 'pf-u-max-width',
-      'data-testid': 'azure-resource-group-select',
-      label: 'Resource group',
-      isRequired: true,
-      validate: [
-        {
-          type: validatorTypes.REQUIRED,
-        },
-      ],
-      condition: {
-        when: 'azure-type',
-        is: 'azure-type-source',
-      },
-    },
-    {
-      component: componentTypes.TEXT_FIELD,
-      name: 'azure-resource-group',
-      className: 'pf-u-w-50',
-      'data-testid': 'azure-resource-group-manual',
-      type: 'text',
-      label: 'Resource group',
-      isRequired: true,
-      validate: [
-        {
-          type: validatorTypes.REQUIRED,
-        },
-        {
-          type: validatorTypes.PATTERN,
-          pattern: /^[-\w._()]+[-\w_()]$/,
-          message:
-            'Resource group names only allow alphanumeric characters, ' +
-            'periods, underscores, hyphens, and parenthesis and cannot end in a period',
-        },
-      ],
-      condition: {
-        when: 'azure-type',
-        is: 'azure-type-manual',
-      },
-    },
-    // TODO check oauth2 thing too here?
-  ],
-};
--- a/src/Components/CreateImageWizard/steps/msAzure.js
+++ b/src/Components/CreateImageWizard/steps/msAzure.js
@ -10,6 +10,22 @@ import StepTemplate from './stepTemplate';

 import CustomButtons from '../formComponents/CustomButtons';

+const SourcesButton = () => {
+  return (
+    <Button
+      component="a"
+      target="_blank"
+      variant="link"
+      icon={<ExternalLinkAltIcon />}
+      iconPosition="right"
+      isInline
+      href={'settings/sources'}
+    >
+      Create and manage sources here
+    </Button>
+  );
+};
+
 export default {
  StepTemplate,
  id: 'wizard-target-msazure',
@ -43,7 +59,8 @@ export default {
            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
-            &quot;Contributor&quot; to at least one resource group.
+            &quot;Contributor&quot; for the resource group you want to upload
+            to. This applies even when defining target by Source selection.
            <br />
            <Button
              component="a"
@ -60,14 +77,95 @@ export default {
        </TextContent>
      ),
    },
+    {
+      component: componentTypes.RADIO,
+      label: 'Share method:',
+      name: 'azure-type',
+      initialValue: 'azure-type-source',
+      autoFocus: true,
+      options: [
+        {
+          label: 'Use an account configured from Sources.',
+          description:
+            'Use a configured source to launch environments directly from the console.',
+          value: 'azure-type-source',
+          'data-testid': 'azure-radio-source',
+          autoFocus: true,
+        },
+        {
+          label: 'Manually enter the account information.',
+          value: 'azure-type-manual',
+          'data-testid': 'azure-radio-manual',
+          className: 'pf-u-mt-sm',
+        },
+      ],
+    },
+    {
+      component: 'azure-sources-select',
+      name: 'azure-sources-select',
+      className: 'pf-u-max-width',
+      label: 'Source Name',
+      isRequired: true,
+      validate: [
+        {
+          type: validatorTypes.REQUIRED,
+        },
+      ],
+      condition: {
+        when: 'azure-type',
+        is: 'azure-type-source',
+      },
+    },
+    {
+      component: componentTypes.PLAIN_TEXT,
+      name: 'azure-sources-select-description',
+      label: <SourcesButton />,
+      condition: {
+        when: 'azure-type',
+        is: 'azure-type-source',
+      },
+    },
+    {
+      name: 'gallery-layout',
+      component: 'gallery-layout',
+      minWidths: { default: '12.5rem' },
+      maxWidths: { default: '12.5rem' },
+      fields: [
+        {
+          component: componentTypes.TEXT_FIELD,
+          name: 'azure-tenant-id',
+          'data-testid': 'azure-tenant-id-source',
+          type: 'text',
+          label: 'Azure Tenant GUID',
+          isRequired: true,
+          isReadOnly: true,
+        },
+        {
+          component: componentTypes.TEXT_FIELD,
+          name: 'azure-subscription-id',
+          'data-testid': 'azure-subscription-id-source',
+          type: 'text',
+          label: 'Subscription ID',
+          isRequired: true,
+          isReadOnly: true,
+          condition: {
+            when: 'azure-type',
+            is: 'azure-type-source',
+          },
+        },
+      ],
+      condition: {
+        when: 'azure-type',
+        is: 'azure-type-source',
+      },
+    },
    {
      component: componentTypes.TEXT_FIELD,
      name: 'azure-tenant-id',
      className: 'pf-u-w-50',
-      'data-testid': 'azure-tenant-id',
+      'data-testid': 'azure-tenant-id-manual',
      type: 'text',
      label: 'Azure Tenant GUID',
-      required: true,
      isRequired: true,
      autoFocus: true,
      validate: [
@ -81,6 +179,10 @@ export default {
          message: 'Please enter a valid tenant ID',
        },
      ],
+      condition: {
+        when: 'azure-type',
+        is: 'azure-type-manual',
+      },
    },
    {
      component: 'azure-auth-button',
@ -93,7 +195,7 @@ export default {
      component: componentTypes.TEXT_FIELD,
      name: 'azure-subscription-id',
      className: 'pf-u-w-50',
-      'data-testid': 'azure-subscription-id',
+      'data-testid': 'azure-subscription-id-manual',
      type: 'text',
      label: 'Subscription ID',
      isRequired: true,
@ -108,12 +210,33 @@ export default {
          message: 'Please enter a valid subscription ID',
        },
      ],
+      condition: {
+        when: 'azure-type',
+        is: 'azure-type-manual',
+      },
+    },
+    {
+      component: 'azure-resource-groups',
+      name: 'azure-resource-group',
+      className: 'pf-u-max-width',
+      'data-testid': 'azure-resource-group-select',
+      label: 'Resource group',
+      isRequired: true,
+      validate: [
+        {
+          type: validatorTypes.REQUIRED,
+        },
+      ],
+      condition: {
+        when: 'azure-type',
+        is: 'azure-type-source',
+      },
    },
    {
      component: componentTypes.TEXT_FIELD,
      name: 'azure-resource-group',
      className: 'pf-u-w-50',
-      'data-testid': 'azure-resource-group',
+      'data-testid': 'azure-resource-group-manual',
      type: 'text',
      label: 'Resource group',
      isRequired: true,
@ -129,6 +252,10 @@ export default {
            'periods, underscores, hyphens, and parenthesis and cannot end in a period',
        },
      ],
+      condition: {
+        when: 'azure-type',
+        is: 'azure-type-manual',
+      },
    },
    // TODO check oauth2 thing too here?
  ],
--- a/src/Components/ImagesTable/ImageLink.js
+++ b/src/Components/ImagesTable/ImageLink.js
@ -11,7 +11,6 @@ import ImageLinkDirect from './ImageLinkDirect';

 import { MODAL_ANCHOR } from '../../constants';
 import { selectImageById } from '../../store/composesSlice';
-import { useGetEnvironment } from '../../Utilities/useGetEnvironment';

 const getImageProvider = ({ imageType }) => {
  switch (imageType) {
@ -97,12 +96,10 @@ const ImageLink = ({ imageId, isExpired, isInClonesTable }) => {
  const image = useSelector((state) => selectImageById(state, imageId));
  const uploadStatus = image.uploadStatus;
  const { initialized: chromeInitialized, getEnvironment } = useChrome();
-  const { isBeta } = useGetEnvironment();
  const azureFeatureFlag = useFlag('provisioning.azure');
  const gcpFeatureFlag = useFlag('provisioning.gcp');
  const scalprum = useScalprum();
-  const hasProvisioning =
-    chromeInitialized && scalprum.config?.provisioning && isBeta();
+  const hasProvisioning = chromeInitialized && scalprum.config?.provisioning;

  if (!uploadStatus || image.status !== 'success') return null;