ESLint: Add rule to sort imports alphabetically

The `import/order` rule isn't enough to sort import within a single import group alphabetically.

This adds `sort-imports` rule that handles the sorting within groups.

eslint.config.js

@@ -86,6 +86,11 @@ module.exports = defineConfig([
         ],
         pathGroupsExcludedImportTypes: ['react']
       }],
+      'sort-imports': ['error', {
+        ignoreCase: true,
+        ignoreDeclarationSort: true,
+        ignoreMemberSort: false,
+      }],
       'no-duplicate-imports': 'error',
       'prefer-const': ['error', {
         destructuring: 'any',

playwright/Customizations/Filesystem.spec.ts

@@ -6,18 +6,18 @@ import { test } from '../fixtures/cleanup';
 import { isHosted } from '../helpers/helpers';
 import { ensureAuthenticated } from '../helpers/login';
 import {
-  navigateToOptionalSteps,
   ibFrame,
   navigateToLandingPage,
+  navigateToOptionalSteps,
 } from '../helpers/navHelpers';
 import {
-  registerLater,
-  fillInDetails,
   createBlueprint,
-  fillInImageOutputGuest,
   deleteBlueprint,
   exportBlueprint,
+  fillInDetails,
+  fillInImageOutputGuest,
   importBlueprint,
+  registerLater,
 } from '../helpers/wizardHelpers';
 
 test('Create a blueprint with Filesystem customization', async ({

playwright/Customizations/Firewall.spec.ts

@@ -5,18 +5,18 @@ import { test } from '../fixtures/customizations';
 import { isHosted } from '../helpers/helpers';
 import { ensureAuthenticated } from '../helpers/login';
 import {
-  navigateToOptionalSteps,
   ibFrame,
   navigateToLandingPage,
+  navigateToOptionalSteps,
 } from '../helpers/navHelpers';
 import {
-  registerLater,
-  fillInDetails,
   createBlueprint,
-  fillInImageOutputGuest,
   deleteBlueprint,
   exportBlueprint,
+  fillInDetails,
+  fillInImageOutputGuest,
   importBlueprint,
+  registerLater,
 } from '../helpers/wizardHelpers';
 
 test('Create a blueprint with Firewall customization', async ({

playwright/Customizations/Hostname.spec.ts

@@ -5,18 +5,18 @@ import { test } from '../fixtures/customizations';
 import { isHosted } from '../helpers/helpers';
 import { ensureAuthenticated } from '../helpers/login';
 import {
-  navigateToOptionalSteps,
   ibFrame,
   navigateToLandingPage,
+  navigateToOptionalSteps,
 } from '../helpers/navHelpers';
 import {
-  registerLater,
-  fillInDetails,
   createBlueprint,
-  fillInImageOutputGuest,
   deleteBlueprint,
   exportBlueprint,
+  fillInDetails,
+  fillInImageOutputGuest,
   importBlueprint,
+  registerLater,
 } from '../helpers/wizardHelpers';
 
 test('Create a blueprint with Hostname customization', async ({

playwright/Customizations/Kernel.spec.ts

@@ -5,18 +5,18 @@ import { test } from '../fixtures/customizations';
 import { isHosted } from '../helpers/helpers';
 import { ensureAuthenticated } from '../helpers/login';
 import {
-  navigateToOptionalSteps,
   ibFrame,
   navigateToLandingPage,
+  navigateToOptionalSteps,
 } from '../helpers/navHelpers';
 import {
-  registerLater,
-  fillInDetails,
   createBlueprint,
-  fillInImageOutputGuest,
   deleteBlueprint,
   exportBlueprint,
+  fillInDetails,
+  fillInImageOutputGuest,
   importBlueprint,
+  registerLater,
 } from '../helpers/wizardHelpers';
 
 test('Create a blueprint with Kernel customization', async ({

playwright/Customizations/Locale.spec.ts

@@ -5,18 +5,18 @@ import { test } from '../fixtures/customizations';
 import { isHosted } from '../helpers/helpers';
 import { ensureAuthenticated } from '../helpers/login';
 import {
-  navigateToOptionalSteps,
   ibFrame,
   navigateToLandingPage,
+  navigateToOptionalSteps,
 } from '../helpers/navHelpers';
 import {
-  registerLater,
-  fillInDetails,
   createBlueprint,
-  fillInImageOutputGuest,
   deleteBlueprint,
   exportBlueprint,
+  fillInDetails,
+  fillInImageOutputGuest,
   importBlueprint,
+  registerLater,
 } from '../helpers/wizardHelpers';
 
 test('Create a blueprint with Locale customization', async ({

playwright/Customizations/Systemd.spec.ts

@@ -5,18 +5,18 @@ import { test } from '../fixtures/customizations';
 import { isHosted } from '../helpers/helpers';
 import { ensureAuthenticated } from '../helpers/login';
 import {
-  navigateToOptionalSteps,
   ibFrame,
   navigateToLandingPage,
+  navigateToOptionalSteps,
 } from '../helpers/navHelpers';
 import {
-  registerLater,
-  fillInDetails,
   createBlueprint,
-  fillInImageOutputGuest,
   deleteBlueprint,
   exportBlueprint,
+  fillInDetails,
+  fillInImageOutputGuest,
   importBlueprint,
+  registerLater,
 } from '../helpers/wizardHelpers';
 
 test('Create a blueprint with Systemd customization', async ({

playwright/Customizations/Timezone.spec.ts

@@ -5,18 +5,18 @@ import { test } from '../fixtures/customizations';
 import { isHosted } from '../helpers/helpers';
 import { ensureAuthenticated } from '../helpers/login';
 import {
-  navigateToOptionalSteps,
   ibFrame,
   navigateToLandingPage,
+  navigateToOptionalSteps,
 } from '../helpers/navHelpers';
 import {
-  registerLater,
-  fillInDetails,
   createBlueprint,
-  fillInImageOutputGuest,
   deleteBlueprint,
   exportBlueprint,
+  fillInDetails,
+  fillInImageOutputGuest,
   importBlueprint,
+  registerLater,
 } from '../helpers/wizardHelpers';
 
 test('Create a blueprint with Timezone customization', async ({

playwright/helpers/helpers.ts

@@ -1,4 +1,4 @@
-import { type Page, expect } from '@playwright/test';
+import { expect, type Page } from '@playwright/test';
 
 export const togglePreview = async (page: Page) => {
   const toggleSwitch = page.locator('#preview-toggle');

playwright/helpers/login.ts

@@ -1,6 +1,6 @@
 import path from 'path';
 
-import { type Page, expect } from '@playwright/test';
+import { expect, type Page } from '@playwright/test';
 
 import { closePopupsIfExist, isHosted, togglePreview } from './helpers';
 import { ibFrame } from './navHelpers';

src/Components/Blueprints/BlueprintCard.tsx

@@ -3,10 +3,10 @@ import React from 'react';
 import {
   Badge,
   Card,
-  CardHeader,
-  CardTitle,
   CardBody,
   CardFooter,
+  CardHeader,
+  CardTitle,
   Spinner,
 } from '@patternfly/react-core';
 

src/Components/Blueprints/BlueprintDiffModal.tsx

@@ -4,10 +4,10 @@ import { DiffEditor } from '@monaco-editor/react';
 import {
   Button,
   Modal,
-  ModalVariant,
   ModalBody,
   ModalFooter,
   ModalHeader,
+  ModalVariant,
 } from '@patternfly/react-core';
 
 import { BuildImagesButton } from './BuildImagesButton';

src/Components/Blueprints/BlueprintVersionFilter.tsx

@@ -10,9 +10,9 @@ import { MenuToggleElement } from '@patternfly/react-core/dist/esm/components/Me
 import { FilterIcon } from '@patternfly/react-icons';
 
 import {
-  versionFilterType,
   selectBlueprintVersionFilter,
   setBlueprintVersionFilter,
+  versionFilterType,
 } from '../../store/BlueprintSlice';
 import { useAppDispatch, useAppSelector } from '../../store/hooks';
 

src/Components/Blueprints/BlueprintsSideBar.tsx

@@ -26,8 +26,8 @@ import BlueprintsPagination from './BlueprintsPagination';
 
 import {
   DEBOUNCED_SEARCH_WAIT_TIME,
-  PAGINATION_OFFSET,
   PAGINATION_LIMIT,
+  PAGINATION_OFFSET,
 } from '../../constants';
 import { useGetBlueprintsQuery } from '../../store/backendApi';
 import {

src/Components/Blueprints/BuildImagesButton.tsx

@@ -1,18 +1,18 @@
 import React, { useEffect, useState } from 'react';
 
 import {
+  Button,
+  ButtonProps,
   Dropdown,
-  MenuToggle,
-  Menu,
-  MenuContent,
-  MenuList,
-  MenuItem,
   Flex,
   FlexItem,
-  Spinner,
+  Menu,
+  MenuContent,
+  MenuItem,
+  MenuList,
+  MenuToggle,
   MenuToggleAction,
-  ButtonProps,
-  Button,
+  Spinner,
 } from '@patternfly/react-core';
 import { MenuToggleElement } from '@patternfly/react-core/dist/esm/components/MenuToggle/MenuToggle';
 import useChrome from '@redhat-cloud-services/frontend-components/useChrome';

src/Components/CreateImageWizard/CreateImageWizard.tsx

@@ -2,14 +2,14 @@ import React, { useEffect, useState } from 'react';
 
 import {
   Button,
+  Flex,
+  PageSection,
+  PageSectionTypes,
+  useWizardContext,
   Wizard,
   WizardFooterWrapper,
   WizardNavItem,
   WizardStep,
-  useWizardContext,
-  PageSection,
-  PageSectionTypes,
-  Flex,
 } from '@patternfly/react-core';
 import { WizardStepType } from '@patternfly/react-core/dist/esm/components/Wizard';
 import useChrome from '@redhat-cloud-services/frontend-components/useChrome';
@@ -40,40 +40,41 @@ import UsersStep from './steps/Users';
 import { getHostArch, getHostDistro } from './utilities/getHostInfo';
 import { useHasSpecificTargetOnly } from './utilities/hasSpecificTargetOnly';
 import {
-  useFilesystemValidation,
-  useSnapshotValidation,
-  useFirstBootValidation,
   useDetailsValidation,
-  useRegistrationValidation,
+  useFilesystemValidation,
+  useFirewallValidation,
+  useFirstBootValidation,
   useHostnameValidation,
   useKernelValidation,
-  useUsersValidation,
-  useTimezoneValidation,
-  useFirewallValidation,
-  useServicesValidation,
   useLocaleValidation,
+  useRegistrationValidation,
+  useServicesValidation,
+  useSnapshotValidation,
+  useTimezoneValidation,
+  useUsersValidation,
 } from './utilities/useValidation';
 import {
   isAwsAccountIdValid,
-  isAzureTenantGUIDValid,
-  isAzureSubscriptionIdValid,
   isAzureResourceGroupValid,
+  isAzureSubscriptionIdValid,
+  isAzureTenantGUIDValid,
   isGcpEmailValid,
 } from './validators';
 
 import {
-  RHEL_8,
-  RHEL_10_BETA,
-  RHEL_10,
   AARCH64,
   AMPLITUDE_MODULE_NAME,
+  RHEL_10,
+  RHEL_10_BETA,
+  RHEL_8,
   RHEL_9,
 } from '../../constants';
 import { useAppDispatch, useAppSelector } from '../../store/hooks';
 import './CreateImageWizard.scss';
 import {
-  changeDistribution,
+  addImageType,
   changeArchitecture,
+  changeDistribution,
   initializeWizard,
   selectAwsAccountId,
   selectAwsShareMethod,
@@ -87,7 +88,6 @@ import {
   selectGcpEmail,
   selectGcpShareMethod,
   selectImageTypes,
-  addImageType,
 } from '../../store/wizardSlice';
 import isRhel from '../../Utilities/isRhel';
 import { resolveRelPath } from '../../Utilities/path';

src/Components/CreateImageWizard/steps/Details/index.tsx

@@ -1,12 +1,12 @@
 import React from 'react';
 
 import {
+  Content,
   Form,
   FormGroup,
   FormHelperText,
   HelperText,
   HelperTextItem,
-  Content,
   Title,
 } from '@patternfly/react-core';
 

src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemPartition.tsx

@@ -5,8 +5,8 @@ import { FormGroup, Label, Radio } from '@patternfly/react-core';
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
 import {
   changeFileSystemConfigurationType,
-  selectFileSystemConfigurationType,
   selectComplianceProfileID,
+  selectFileSystemConfigurationType,
 } from '../../../../../store/wizardSlice';
 
 const FileSystemPartition = () => {

src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemTable.tsx

@@ -1,28 +1,28 @@
 import React, { useRef, useState } from 'react';
 
 import {
-  Popover,
-  Content,
-  Button,
   Alert,
-  TextInput,
-  Select,
-  MenuToggleElement,
+  Button,
+  Content,
   MenuToggle,
+  MenuToggleElement,
+  Popover,
+  Select,
   SelectList,
   SelectOption,
+  TextInput,
 } from '@patternfly/react-core';
 import { HelpIcon, MinusCircleIcon } from '@patternfly/react-icons';
 import styles from '@patternfly/react-styles/css/components/Table/table';
 import {
   Table,
-  Th,
-  Thead,
   Tbody,
-  Tr,
-  TrProps,
   TbodyProps,
   Td,
+  Th,
+  Thead,
+  Tr,
+  TrProps,
 } from '@patternfly/react-table';
 
 import { UNIT_GIB, UNIT_KIB, UNIT_MIB } from '../../../../../constants';

src/Components/CreateImageWizard/steps/FirstBoot/index.tsx

@@ -2,14 +2,14 @@ import React from 'react';
 
 import { CodeEditor, Language } from '@patternfly/react-code-editor';
 import {
+  Alert,
   Content,
   Form,
   FormGroup,
   FormHelperText,
-  Title,
-  Alert,
   HelperText,
   HelperTextItem,
+  Title,
 } from '@patternfly/react-core';
 
 import { FIRST_BOOT_SERVICE } from '../../../../constants';

src/Components/CreateImageWizard/steps/ImageOutput/components/ReleaseLifecycle.tsx

@@ -14,14 +14,14 @@ import { Bar } from 'react-chartjs-2';
 
 import {
   RELEASE_LIFECYCLE_URL,
+  RHEL_10_FULL_SUPPORT,
+  RHEL_10_MAINTENANCE_SUPPORT,
   RHEL_8,
   RHEL_8_FULL_SUPPORT,
   RHEL_8_MAINTENANCE_SUPPORT,
   RHEL_9,
   RHEL_9_FULL_SUPPORT,
   RHEL_9_MAINTENANCE_SUPPORT,
-  RHEL_10_FULL_SUPPORT,
-  RHEL_10_MAINTENANCE_SUPPORT,
 } from '../../../../../constants';
 import { useAppSelector } from '../../../../../store/hooks';
 import { selectDistribution } from '../../../../../store/wizardSlice';

src/Components/CreateImageWizard/steps/ImageOutput/components/ReleaseSelect.tsx

@@ -10,7 +10,12 @@ import {
 } from '@patternfly/react-core';
 
 import {
+  ON_PREM_RELEASES,
   RELEASES,
+  RHEL_10,
+  RHEL_10_BETA,
+  RHEL_10_FULL_SUPPORT,
+  RHEL_10_MAINTENANCE_SUPPORT,
   RHEL_8,
   RHEL_8_FULL_SUPPORT,
   RHEL_8_MAINTENANCE_SUPPORT,
@@ -18,11 +23,6 @@ import {
   RHEL_9_BETA,
   RHEL_9_FULL_SUPPORT,
   RHEL_9_MAINTENANCE_SUPPORT,
-  RHEL_10_BETA,
-  RHEL_10,
-  RHEL_10_FULL_SUPPORT,
-  RHEL_10_MAINTENANCE_SUPPORT,
-  ON_PREM_RELEASES,
 } from '../../../../../constants';
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
 import { Distributions } from '../../../../../store/imageBuilderApi';

src/Components/CreateImageWizard/steps/ImageOutput/components/TargetEnvironment.tsx

@@ -3,20 +3,20 @@ import React, { MouseEventHandler, useEffect } from 'react';
 import {
   Button,
   Card,
-  Checkbox,
-  FormGroup,
-  Popover,
-  Content,
   CardHeader,
-  Gallery,
+  Checkbox,
+  Content,
   Flex,
   FlexItem,
+  FormGroup,
+  Gallery,
+  Popover,
   Title,
 } from '@patternfly/react-core';
-import { HelpIcon, ExternalLinkAltIcon } from '@patternfly/react-icons';
+import { ExternalLinkAltIcon, HelpIcon } from '@patternfly/react-icons';
 
 import { useGetArchitecturesQuery } from '../../../../../store/backendApi';
-import { useAppSelector, useAppDispatch } from '../../../../../store/hooks';
+import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
 import { ImageTypes } from '../../../../../store/imageBuilderApi';
 import { provisioningApi } from '../../../../../store/provisioningApi';
 import { rhsmApi } from '../../../../../store/rhsmApi';

src/Components/CreateImageWizard/steps/Oscap/components/OscapProfileInformation.tsx

@@ -1,11 +1,11 @@
 import React, { useEffect } from 'react';
 
 import {
-  Spinner,
-  Content,
-  ContentVariants,
   CodeBlock,
   CodeBlockCode,
+  Content,
+  ContentVariants,
+  Spinner,
 } from '@patternfly/react-core';
 
 import { useGetOscapCustomizationsQuery } from '../../../../../store/backendApi';

src/Components/CreateImageWizard/steps/Oscap/components/PolicySelector.tsx

@@ -10,8 +10,8 @@ import {
 import { v4 as uuidv4 } from 'uuid';
 
 import {
-  usePoliciesQuery,
   PolicyRead,
+  usePoliciesQuery,
 } from '../../../../../store/complianceApi';
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
 import {
@@ -21,20 +21,20 @@ import {
   useLazyGetOscapCustomizationsForPolicyQuery,
 } from '../../../../../store/imageBuilderApi';
 import {
-  changeCompliance,
-  selectDistribution,
-  selectCompliancePolicyID,
-  selectCompliancePolicyTitle,
+  addKernelArg,
   addPackage,
   addPartition,
-  changeFileSystemConfigurationType,
-  removePackage,
-  clearPartitions,
-  changeEnabledServices,
-  changeMaskedServices,
+  changeCompliance,
   changeDisabledServices,
+  changeEnabledServices,
+  changeFileSystemConfigurationType,
+  changeMaskedServices,
   clearKernelAppend,
-  addKernelArg,
+  clearPartitions,
+  removePackage,
+  selectCompliancePolicyID,
+  selectCompliancePolicyTitle,
+  selectDistribution,
 } from '../../../../../store/wizardSlice';
 import { useHasSpecificTargetOnly } from '../../../utilities/hasSpecificTargetOnly';
 import { parseSizeUnit } from '../../../utilities/parseSizeUnit';

src/Components/CreateImageWizard/steps/Oscap/components/ProfileSelector.tsx

@@ -18,10 +18,10 @@ import { TimesIcon } from '@patternfly/react-icons';
 import { v4 as uuidv4 } from 'uuid';
 
 import {
-  useGetOscapProfilesQuery,
-  useGetOscapCustomizationsQuery,
-  useLazyGetOscapCustomizationsQuery,
   useBackendPrefetch,
+  useGetOscapCustomizationsQuery,
+  useGetOscapProfilesQuery,
+  useLazyGetOscapCustomizationsQuery,
 } from '../../../../../store/backendApi';
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
 import {
@@ -32,20 +32,20 @@ import {
   Services,
 } from '../../../../../store/imageBuilderApi';
 import {
-  changeCompliance,
-  selectDistribution,
-  selectComplianceProfileID,
+  addKernelArg,
   addPackage,
   addPartition,
-  changeFileSystemConfigurationType,
-  removePackage,
-  clearPartitions,
-  changeEnabledServices,
-  changeMaskedServices,
+  changeCompliance,
   changeDisabledServices,
-  selectComplianceType,
+  changeEnabledServices,
+  changeFileSystemConfigurationType,
+  changeMaskedServices,
   clearKernelAppend,
-  addKernelArg,
+  clearPartitions,
+  removePackage,
+  selectComplianceProfileID,
+  selectComplianceType,
+  selectDistribution,
 } from '../../../../../store/wizardSlice';
 import { useHasSpecificTargetOnly } from '../../../utilities/hasSpecificTargetOnly';
 import { parseSizeUnit } from '../../../utilities/parseSizeUnit';

src/Components/CreateImageWizard/steps/Oscap/index.tsx

@@ -3,8 +3,8 @@ import React, { useEffect } from 'react';
 import {
   Alert,
   AlertActionLink,
-  Form,
   Content,
+  Form,
   Title,
   ToggleGroup,
   ToggleGroupItem,
@@ -24,18 +24,18 @@ import {
 import { usePoliciesQuery } from '../../../../store/complianceApi';
 import { useAppDispatch, useAppSelector } from '../../../../store/hooks';
 import {
-  ComplianceType,
-  selectComplianceProfileID,
   changeCompliance,
   changeComplianceType,
-  changeEnabledServices,
-  changeMaskedServices,
   changeDisabledServices,
-  removePackage,
+  changeEnabledServices,
   changeFileSystemConfigurationType,
-  selectDistribution,
-  selectComplianceType,
+  changeMaskedServices,
   clearKernelAppend,
+  ComplianceType,
+  removePackage,
+  selectComplianceProfileID,
+  selectComplianceType,
+  selectDistribution,
 } from '../../../../store/wizardSlice';
 import { useFlag } from '../../../../Utilities/useGetEnvironment';
 import { useOnPremOpenSCAPAvailable } from '../../../../Utilities/useOnPremOpenSCAP';

src/Components/CreateImageWizard/steps/Oscap/removeBetaFromRelease.ts

@@ -1,8 +1,8 @@
 import {
-  RHEL_9_BETA,
-  RHEL_9,
-  RHEL_10_BETA,
   RHEL_10,
+  RHEL_10_BETA,
+  RHEL_9,
+  RHEL_9_BETA,
 } from '../../../../constants';
 import { Distributions } from '../../../../store/imageBuilderApi';
 

src/Components/CreateImageWizard/steps/Packages/PackageRecommendations.tsx

@@ -3,6 +3,8 @@ import React, { useEffect, useState } from 'react';
 import {
   Alert,
   Button,
+  Content,
+  ContentVariants,
   ExpandableSection,
   Flex,
   FlexItem,
@@ -12,8 +14,6 @@ import {
   PanelMainBody,
   Popover,
   Spinner,
-  Content,
-  ContentVariants,
 } from '@patternfly/react-core';
 import { HelpIcon, OptimizeIcon } from '@patternfly/react-icons';
 import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';

src/Components/CreateImageWizard/steps/Packages/Packages.tsx

@@ -3,6 +3,7 @@ import React, { ReactElement, useEffect, useMemo, useState } from 'react';
 import {
   Bullseye,
   Button,
+  Content,
   DescriptionList,
   DescriptionListDescription,
   DescriptionListGroup,
@@ -14,6 +15,9 @@ import {
   EmptyStateVariant,
   Icon,
   Modal,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
   Pagination,
   PaginationVariant,
   Popover,
@@ -23,15 +27,11 @@ import {
   Tab,
   Tabs,
   TabTitleText,
-  Content,
   ToggleGroup,
   ToggleGroupItem,
   Toolbar,
   ToolbarContent,
   ToolbarItem,
-  ModalHeader,
-  ModalBody,
-  ModalFooter,
 } from '@patternfly/react-core';
 import {
   CheckCircleIcon,
@@ -66,33 +66,33 @@ import {
 } from '../../../../constants';
 import { useGetArchitecturesQuery } from '../../../../store/backendApi';
 import {
-  ApiRepositoryResponseRead,
-  useCreateRepositoryMutation,
-  useListRepositoriesQuery,
-  useSearchRpmMutation,
-  useSearchPackageGroupMutation,
-  ApiSearchRpmResponse,
   ApiPackageSourcesResponse,
+  ApiRepositoryResponseRead,
+  ApiSearchRpmResponse,
+  useCreateRepositoryMutation,
   useGetTemplateQuery,
+  useListRepositoriesQuery,
+  useSearchPackageGroupMutation,
+  useSearchRpmMutation,
 } from '../../../../store/contentSourcesApi';
 import { useAppSelector } from '../../../../store/hooks';
 import { Package } from '../../../../store/imageBuilderApi';
 import {
+  addGroup,
+  addModule,
+  addPackage,
+  addRecommendedRepository,
+  removeGroup,
+  removeModule,
+  removePackage,
+  removeRecommendedRepository,
   selectArchitecture,
-  selectPackages,
-  selectGroups,
   selectCustomRepositories,
   selectDistribution,
-  addPackage,
-  removePackage,
-  addGroup,
-  removeGroup,
-  addRecommendedRepository,
-  removeRecommendedRepository,
-  selectRecommendedRepositories,
-  addModule,
-  removeModule,
+  selectGroups,
   selectModules,
+  selectPackages,
+  selectRecommendedRepositories,
   selectTemplate,
 } from '../../../../store/wizardSlice';
 import {

src/Components/CreateImageWizard/steps/Packages/components/CustomHelperText.tsx

@@ -1,9 +1,9 @@
 import React from 'react';
 
 import {
+  FormHelperText,
   HelperText,
   HelperTextItem,
-  FormHelperText,
 } from '@patternfly/react-core';
 import { ExclamationCircleIcon } from '@patternfly/react-icons';
 export type HelperTextVariant =

src/Components/CreateImageWizard/steps/Packages/components/PackageInfoNotAvailablePopover.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Button, Popover, Content } from '@patternfly/react-core';
+import { Button, Content, Popover } from '@patternfly/react-core';
 import { HelpIcon } from '@patternfly/react-icons';
 
 const PackageInfoNotAvailablePopover = () => {

src/Components/CreateImageWizard/steps/Packages/components/RepoPopovers.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Button, Popover, Content } from '@patternfly/react-core';
+import { Button, Content, Popover } from '@patternfly/react-core';
 import { HelpIcon } from '@patternfly/react-icons';
 
 export const IncludedReposPopover = () => {

src/Components/CreateImageWizard/steps/Registration/components/ActivationKeyInformation.tsx

@@ -3,10 +3,10 @@ import React from 'react';
 import {
   Alert,
   Button,
-  Spinner,
   Content,
   ContentVariants,
   Popover,
+  Spinner,
 } from '@patternfly/react-core';
 import { HelpIcon } from '@patternfly/react-icons';
 import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';

src/Components/CreateImageWizard/steps/Registration/components/ActivationKeysList.tsx

@@ -3,17 +3,17 @@ import React, { useEffect, useState } from 'react';
 import {
   Alert,
   FormGroup,
-  Spinner,
-  Select,
-  SelectList,
-  SelectOption,
-  MenuToggleElement,
-  MenuToggle,
-  TextInputGroup,
-  TextInputGroupMain,
   FormHelperText,
   HelperText,
   HelperTextItem,
+  MenuToggle,
+  MenuToggleElement,
+  Select,
+  SelectList,
+  SelectOption,
+  Spinner,
+  TextInputGroup,
+  TextInputGroupMain,
 } from '@patternfly/react-core';
 import { useAddNotification } from '@redhat-cloud-services/frontend-components-notifications/hooks';
 
@@ -22,8 +22,8 @@ import ManageKeysButton from './ManageKeysButton';
 import { CDN_PROD_URL, CDN_STAGE_URL } from '../../../../../constants';
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
 import {
-  useListActivationKeysQuery,
   useCreateActivationKeysMutation,
+  useListActivationKeysQuery,
 } from '../../../../../store/rhsmApi';
 import {
   changeActivationKey,

src/Components/CreateImageWizard/steps/Registration/components/Registration.tsx

@@ -3,10 +3,10 @@ import React, { useEffect, useState } from 'react';
 import {
   Button,
   Checkbox,
+  Content,
   FormGroup,
   Popover,
   Radio,
-  Content,
 } from '@patternfly/react-core';
 import { ExternalLinkAltIcon, HelpIcon } from '@patternfly/react-icons';
 import { useFlag } from '@unleash/proxy-client-react';

src/Components/CreateImageWizard/steps/Registration/index.tsx

@@ -1,13 +1,13 @@
 import React, { useEffect, useState } from 'react';
 
 import {
+  ClipboardCopy,
   Form,
-  Title,
   FormGroup,
   FormHelperText,
-  ClipboardCopy,
   HelperText,
   HelperTextItem,
+  Title,
 } from '@patternfly/react-core';
 import useChrome from '@redhat-cloud-services/frontend-components/useChrome';
 

src/Components/CreateImageWizard/steps/Repositories/Repositories.tsx

@@ -3,21 +3,21 @@ import React, { useEffect, useMemo, useState } from 'react';
 import {
   Alert,
   Button,
+  Grid,
   Modal,
+  ModalBody,
+  ModalFooter,
+  ModalHeader,
   Pagination,
+  PaginationVariant,
   Panel,
   PanelMain,
   SearchInput,
+  ToggleGroup,
+  ToggleGroupItem,
   Toolbar,
   ToolbarContent,
   ToolbarItem,
-  ToggleGroup,
-  ToggleGroupItem,
-  PaginationVariant,
-  Grid,
-  ModalHeader,
-  ModalBody,
-  ModalFooter,
 } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
@@ -41,8 +41,8 @@ import {
 } from '../../../../constants';
 import {
   ApiRepositoryResponseRead,
-  useListRepositoriesQuery,
   useGetTemplateQuery,
+  useListRepositoriesQuery,
   useListRepositoryParametersQuery,
 } from '../../../../store/contentSourcesApi';
 import { useAppDispatch, useAppSelector } from '../../../../store/hooks';

src/Components/CreateImageWizard/steps/Repositories/components/Empty.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 
 import {
+  Button,
   EmptyState,
-  EmptyStateVariant,
   EmptyStateBody,
   EmptyStateFooter,
-  Button,
+  EmptyStateVariant,
 } from '@patternfly/react-core';
 import { RepositoryIcon } from '@patternfly/react-icons';
 

src/Components/CreateImageWizard/steps/Repositories/components/Loading.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { EmptyState, Spinner, Bullseye } from '@patternfly/react-core';
+import { Bullseye, EmptyState, Spinner } from '@patternfly/react-core';
 
 export const Loading = () => {
   return (

src/Components/CreateImageWizard/steps/Repositories/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Alert, Form, Content, Title } from '@patternfly/react-core';
+import { Alert, Content, Form, Title } from '@patternfly/react-core';
 
 import ManageRepositoriesButton from './components/ManageRepositoriesButton';
 import Repositories from './Repositories';

src/Components/CreateImageWizard/steps/Review/Footer/CreateDropdown.tsx

@@ -1,17 +1,17 @@
 import React, { useEffect, useState } from 'react';
 
 import {
-  DropdownList,
+  Button,
   DropdownItem,
-  MenuToggleAction,
-  Spinner,
+  DropdownList,
   Flex,
   FlexItem,
-  Button,
+  MenuToggleAction,
   Modal,
-  ModalHeader,
   ModalBody,
   ModalFooter,
+  ModalHeader,
+  Spinner,
 } from '@patternfly/react-core';
 import useChrome from '@redhat-cloud-services/frontend-components/useChrome';
 import { ChromeUser } from '@redhat-cloud-services/types';

src/Components/CreateImageWizard/steps/Review/Footer/EditDropdown.tsx

@@ -1,12 +1,12 @@
 import React, { useEffect, useState } from 'react';
 
 import {
-  DropdownList,
   DropdownItem,
-  MenuToggleAction,
-  Spinner,
+  DropdownList,
   Flex,
   FlexItem,
+  MenuToggleAction,
+  Spinner,
 } from '@patternfly/react-core';
 import useChrome from '@redhat-cloud-services/frontend-components/useChrome';
 import { ChromeUser } from '@redhat-cloud-services/types';

src/Components/CreateImageWizard/steps/Review/Footer/Footer.tsx

@@ -1,12 +1,12 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import {
   Button,
   Dropdown,
   Flex,
   MenuToggle,
-  WizardFooterWrapper,
   useWizardContext,
+  WizardFooterWrapper,
 } from '@patternfly/react-core';
 import { MenuToggleElement } from '@patternfly/react-core/dist/esm/components/MenuToggle/MenuToggle';
 import { useChrome } from '@redhat-cloud-services/frontend-components/useChrome';

src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx

@@ -2,40 +2,40 @@ import React, { useState } from 'react';
 
 import {
   Button,
-  ExpandableSection,
-  Stack,
-  StackItem,
   Content,
   ContentVariants,
-  useWizardContext,
-  SplitItem,
+  ExpandableSection,
   Split,
+  SplitItem,
+  Stack,
+  StackItem,
+  useWizardContext,
 } from '@patternfly/react-core';
 import { ArrowRightIcon } from '@patternfly/react-icons';
 
 import './ReviewStep.scss';
 import {
   ContentList,
-  FSCList,
-  FirstBootList,
   DetailsList,
+  FirewallList,
+  FirstBootList,
+  FSCList,
+  HostnameList,
   ImageOutputList,
+  KernelList,
+  LocaleList,
   OscapList,
   RegisterLaterList,
   RegisterNowList,
+  RegisterSatelliteList,
+  ServicesList,
   TargetEnvAWSList,
   TargetEnvAzureList,
   TargetEnvGCPList,
   TargetEnvOciList,
   TargetEnvOtherList,
-  UsersList,
   TimezoneList,
-  LocaleList,
-  HostnameList,
-  KernelList,
-  FirewallList,
-  ServicesList,
-  RegisterSatelliteList,
+  UsersList,
 } from './ReviewStepTextLists';
 
 import isRhel from '../../../../../src/Utilities/isRhel';
@@ -44,21 +44,21 @@ import { useAppSelector } from '../../../../store/hooks';
 import {
   selectBlueprintDescription,
   selectBlueprintName,
-  selectComplianceType,
   selectCompliancePolicyID,
   selectComplianceProfileID,
+  selectComplianceType,
   selectDistribution,
-  selectImageTypes,
-  selectRegistrationType,
-  selectHostname,
-  selectLanguages,
-  selectKeyboard,
-  selectTimezone,
-  selectNtpServers,
   selectFirewall,
-  selectServices,
-  selectUsers,
+  selectHostname,
+  selectImageTypes,
   selectKernel,
+  selectKeyboard,
+  selectLanguages,
+  selectNtpServers,
+  selectRegistrationType,
+  selectServices,
+  selectTimezone,
+  selectUsers,
 } from '../../../../store/wizardSlice';
 import { useHasSpecificTargetOnly } from '../../utilities/hasSpecificTargetOnly';
 

src/Components/CreateImageWizard/steps/Review/ReviewStepTables.tsx

@@ -19,8 +19,8 @@ import { useAppSelector } from '../../../../store/hooks';
 import {
   selectCustomRepositories,
   selectDistribution,
-  selectPackages,
   selectGroups,
+  selectPackages,
   selectPartitions,
   selectRecommendedRepositories,
   selectTemplate,

src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx

@@ -3,13 +3,13 @@ import React, { useEffect, useMemo } from 'react';
 import {
   Alert,
   Button,
-  Popover,
+  CodeBlock,
+  CodeBlockCode,
   Content,
   ContentVariants,
   FormGroup,
-  CodeBlock,
-  CodeBlockCode,
   Icon,
+  Popover,
 } from '@patternfly/react-core';
 import { ExclamationTriangleIcon } from '@patternfly/react-icons';
 
@@ -34,8 +34,8 @@ import {
   UNIT_GIB,
 } from '../../../../constants';
 import {
-  useListSnapshotsByDateMutation,
   useGetTemplateQuery,
+  useListSnapshotsByDateMutation,
 } from '../../../../store/contentSourcesApi';
 import { useAppSelector } from '../../../../store/hooks';
 import { useGetSourceListQuery } from '../../../../store/provisioningApi';
@@ -45,39 +45,39 @@ import {
   selectArchitecture,
   selectAwsAccountId,
   selectAwsShareMethod,
+  selectAwsSourceId,
+  selectAzureResourceGroup,
   selectAzureShareMethod,
   selectAzureSource,
-  selectAzureResourceGroup,
   selectAzureSubscriptionId,
   selectAzureTenantId,
-  selectAwsSourceId,
   selectBlueprintDescription,
   selectBlueprintName,
   selectCustomRepositories,
   selectDistribution,
+  selectFileSystemConfigurationType,
+  selectFirewall,
+  selectFirstBootScript,
   selectGcpAccountType,
   selectGcpEmail,
   selectGcpShareMethod,
-  selectPackages,
   selectGroups,
-  selectRegistrationType,
-  selectFileSystemConfigurationType,
-  selectRecommendedRepositories,
-  selectSnapshotDate,
-  selectUseLatest,
-  selectPartitions,
-  selectFirstBootScript,
-  selectTimezone,
-  selectNtpServers,
-  selectLanguages,
-  selectKeyboard,
   selectHostname,
   selectKernel,
-  selectFirewall,
-  selectServices,
-  selectUsers,
-  selectTemplate,
+  selectKeyboard,
+  selectLanguages,
+  selectNtpServers,
+  selectPackages,
+  selectPartitions,
+  selectRecommendedRepositories,
   selectRedHatRepositories,
+  selectRegistrationType,
+  selectServices,
+  selectSnapshotDate,
+  selectTemplate,
+  selectTimezone,
+  selectUseLatest,
+  selectUsers,
 } from '../../../../store/wizardSlice';
 import { toMonthAndYear, yyyyMMddFormat } from '../../../../Utilities/time';
 import {

src/Components/CreateImageWizard/steps/Review/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Form, Content, Title } from '@patternfly/react-core';
+import { Content, Form, Title } from '@patternfly/react-core';
 
 import Review from './ReviewStep';
 

src/Components/CreateImageWizard/steps/Snapshot/components/Snapshot.tsx

@@ -2,12 +2,12 @@ import React, { useState } from 'react';
 
 import {
   Button,
+  Content,
   DatePicker,
   Flex,
   FormGroup,
   Grid,
   Radio,
-  Content,
   Title,
 } from '@patternfly/react-core';
 
@@ -15,12 +15,12 @@ import Templates from './Templates';
 
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
 import {
-  selectSnapshotDate,
-  changeUseLatest,
   changeSnapshotDate,
   changeTemplate,
-  selectUseLatest,
+  changeUseLatest,
+  selectSnapshotDate,
   selectTemplate,
+  selectUseLatest,
 } from '../../../../../store/wizardSlice';
 import { yyyyMMddFormat } from '../../../../../Utilities/time';
 import { useFlag } from '../../../../../Utilities/useGetEnvironment';

src/Components/CreateImageWizard/steps/Snapshot/components/Templates.tsx

@@ -8,7 +8,7 @@ import {
   Panel,
   PanelMain,
 } from '@patternfly/react-core';
-import { Table, Thead, Tr, Th, Tbody, Td } from '@patternfly/react-table';
+import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
 
 import TemplatesEmpty from './TemplatesEmpty';
 
@@ -16,11 +16,11 @@ import { PAGINATION_COUNT } from '../../../../../constants';
 import { useListTemplatesQuery } from '../../../../../store/contentSourcesApi';
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
 import {
+  changeTemplate,
+  changeTemplateName,
   selectArchitecture,
   selectDistribution,
   selectTemplate,
-  changeTemplate,
-  changeTemplateName,
 } from '../../../../../store/wizardSlice';
 import { releaseToVersion } from '../../../../../Utilities/releaseToVersion';
 import { Error } from '../../Repositories/components/Error';

src/Components/CreateImageWizard/steps/Snapshot/components/TemplatesEmpty.tsx

@@ -1,11 +1,11 @@
 import React from 'react';
 
 import {
+  Button,
   EmptyState,
-  EmptyStateVariant,
   EmptyStateBody,
   EmptyStateFooter,
-  Button,
+  EmptyStateVariant,
 } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 

src/Components/CreateImageWizard/steps/Snapshot/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Form, Content, Title } from '@patternfly/react-core';
+import { Content, Form, Title } from '@patternfly/react-core';
 
 import Snapshot from './components/Snapshot';
 

src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsAccountId.tsx

@@ -2,10 +2,10 @@ import React, { useEffect } from 'react';
 
 import {
   Alert,
+  FormGroup,
   HelperText,
   HelperTextItem,
   TextInput,
-  FormGroup,
 } from '@patternfly/react-core';
 
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';

src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsSourcesSelect.tsx

@@ -4,11 +4,11 @@ import {
   Alert,
   Button,
   FormGroup,
+  MenuToggle,
+  MenuToggleElement,
   Select,
   SelectList,
   SelectOption,
-  MenuToggle,
-  MenuToggleElement,
   Spinner,
   TextInputGroup,
   TextInputGroupMain,

src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/index.tsx

@@ -1,17 +1,17 @@
 import React from 'react';
 
 import {
-  Radio,
+  Button,
   Content,
   Form,
-  Title,
   FormGroup,
-  TextInput,
   Gallery,
   GalleryItem,
   HelperText,
   HelperTextItem,
-  Button,
+  Radio,
+  TextInput,
+  Title,
 } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 

src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureResourceGroups.tsx

@@ -1,17 +1,17 @@
 import React, { useEffect, useState } from 'react';
 
 import {
+  Button,
   FormGroup,
-  Spinner,
+  MenuToggle,
+  MenuToggleElement,
   Select,
   SelectList,
   SelectOption,
-  MenuToggleElement,
-  MenuToggle,
+  Spinner,
   TextInputGroup,
   TextInputGroupMain,
   TextInputGroupUtilities,
-  Button,
 } from '@patternfly/react-core';
 import { TimesIcon } from '@patternfly/react-icons';
 

src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureSourcesSelect.tsx

@@ -1,18 +1,18 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import {
   Alert,
   Button,
+  FormGroup,
   MenuToggle,
   MenuToggleElement,
-  TextInputGroup,
-  TextInputGroupMain,
-  TextInputGroupUtilities,
-  FormGroup,
-  Spinner,
   Select,
   SelectList,
   SelectOption,
+  Spinner,
+  TextInputGroup,
+  TextInputGroupMain,
+  TextInputGroupUtilities,
 } from '@patternfly/react-core';
 import { TimesIcon } from '@patternfly/react-icons';
 

src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx

@@ -1,15 +1,15 @@
 import React from 'react';
 
 import {
-  Radio,
+  Button,
   Content,
   Form,
-  Title,
   FormGroup,
-  TextInput,
   Gallery,
   GalleryItem,
-  Button,
+  Radio,
+  TextInput,
+  Title,
 } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';
 

src/Components/CreateImageWizard/steps/TargetEnvironment/Gcp/index.tsx

@@ -1,12 +1,12 @@
 import React from 'react';
 
 import {
-  Radio,
   Content,
-  Form,
-  Title,
-  FormGroup,
   ContentVariants,
+  Form,
+  FormGroup,
+  Radio,
+  Title,
 } from '@patternfly/react-core';
 
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';

src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx

@@ -1,18 +1,18 @@
 import React, { useEffect, useState } from 'react';
 
 import {
+  Button,
+  FormGroup,
   HelperText,
   HelperTextItem,
-  Select,
-  SelectOption,
-  SelectList,
   MenuToggle,
   MenuToggleElement,
+  Select,
+  SelectList,
+  SelectOption,
   TextInputGroup,
   TextInputGroupMain,
   TextInputGroupUtilities,
-  Button,
-  FormGroup,
 } from '@patternfly/react-core';
 import TimesIcon from '@patternfly/react-icons/dist/esm/icons/times-icon';
 

src/Components/CreateImageWizard/steps/Users/components/UserInfo.tsx

@@ -2,12 +2,12 @@ import React, { useState } from 'react';
 
 import {
   Button,
-  FormGroup,
   Checkbox,
-  Tabs,
-  Tab,
-  TabTitleText,
+  FormGroup,
   Icon,
+  Tab,
+  Tabs,
+  TabTitleText,
 } from '@patternfly/react-core';
 import {
   ExclamationCircleIcon,
@@ -20,15 +20,15 @@ import RemoveUserModal from './RemoveUserModal';
 import { GENERATING_SSH_KEY_PAIRS_URL } from '../../../../../constants';
 import { useAppDispatch, useAppSelector } from '../../../../../store/hooks';
 import {
+  addUser,
+  addUserGroupByIndex,
+  removeUser,
+  removeUserGroupByIndex,
+  selectUsers,
+  setUserAdministratorByIndex,
   setUserNameByIndex,
   setUserPasswordByIndex,
   setUserSshKeyByIndex,
-  setUserAdministratorByIndex,
-  addUser,
-  selectUsers,
-  addUserGroupByIndex,
-  removeUserGroupByIndex,
-  removeUser,
 } from '../../../../../store/wizardSlice';
 import LabelInput from '../../../LabelInput';
 import { PasswordValidatedInput } from '../../../utilities/PasswordValidatedInput';

src/Components/CreateImageWizard/steps/Users/index.tsx

@@ -1,6 +1,6 @@
 import React from 'react';
 
-import { Form, Content, Title } from '@patternfly/react-core';
+import { Content, Form, Title } from '@patternfly/react-core';
 
 import EmptyUserState from './components/EmptyUserState';
 import UserInfo from './components/UserInfo';

src/Components/CreateImageWizard/utilities/PasswordValidatedInput.tsx

@@ -1,6 +1,7 @@
 import React, { useState } from 'react';
 
 import {
+  Button,
   FormGroup,
   FormHelperText,
   HelperText,
@@ -8,7 +9,6 @@ import {
   InputGroup,
   InputGroupItem,
   TextInput,
-  Button,
   TextInputProps,
 } from '@patternfly/react-core';
 import { EyeIcon, EyeSlashIcon } from '@patternfly/react-icons';

src/Components/CreateImageWizard/utilities/checkRepositoriesAvailability.ts

@@ -5,8 +5,8 @@ import { useListRepositoriesQuery } from '../../../store/contentSourcesApi';
 import { useAppSelector } from '../../../store/hooks';
 import {
   selectArchitecture,
-  selectDistribution,
   selectCustomRepositories,
+  selectDistribution,
 } from '../../../store/wizardSlice';
 import { releaseToVersion } from '../../../Utilities/releaseToVersion';
 

src/Components/CreateImageWizard/utilities/requestMapper.ts

@@ -6,16 +6,16 @@ import { parseSizeUnit } from './parseSizeUnit';
 import {
   CENTOS_9,
   FIRST_BOOT_SERVICE_DATA,
-  SATELLITE_SERVICE_DATA,
+  FIRSTBOOT_PATH,
+  FIRSTBOOT_SERVICE_PATH,
+  RHEL_10,
+  RHEL_10_BETA,
   RHEL_8,
   RHEL_9,
   RHEL_9_BETA,
-  RHEL_10,
-  RHEL_10_BETA,
-  FIRSTBOOT_PATH,
-  FIRSTBOOT_SERVICE_PATH,
-  SATELLITE_SERVICE_PATH,
   SATELLITE_PATH,
+  SATELLITE_SERVICE_DATA,
+  SATELLITE_SERVICE_PATH,
 } from '../../../constants';
 import { RootState } from '../../../store';
 import {
@@ -43,58 +43,58 @@ import {
 } from '../../../store/imageBuilderApi';
 import { ApiRepositoryImportResponseRead } from '../../../store/service/contentSourcesApi';
 import {
+  ComplianceType,
+  initialState,
   selectActivationKey,
   selectArchitecture,
   selectAwsAccountId,
   selectAwsShareMethod,
   selectAwsSourceId,
+  selectAzureHyperVGeneration,
   selectAzureResourceGroup,
   selectAzureShareMethod,
   selectAzureSource,
   selectAzureSubscriptionId,
   selectAzureTenantId,
-  selectAzureHyperVGeneration,
   selectBaseUrl,
   selectBlueprintDescription,
   selectBlueprintName,
-  ComplianceType,
   selectCompliancePolicyID,
   selectComplianceProfileID,
   selectComplianceType,
   selectCustomRepositories,
   selectDistribution,
+  selectFileSystemConfigurationType,
+  selectFirewall,
+  selectFirstBootScript,
   selectGcpAccountType,
   selectGcpEmail,
   selectGcpShareMethod,
   selectGroups,
+  selectHostname,
   selectImageTypes,
   selectKernel,
+  selectKeyboard,
+  selectLanguages,
+  selectMetadata,
+  selectModules,
+  selectNtpServers,
   selectPackages,
+  selectPartitions,
   selectPayloadRepositories,
   selectRecommendedRepositories,
   selectRegistrationType,
-  selectServerUrl,
-  selectServices,
-  wizardState,
-  selectFileSystemConfigurationType,
-  selectPartitions,
-  selectSnapshotDate,
-  selectUseLatest,
-  selectFirstBootScript,
-  initialState,
-  selectTimezone,
-  selectNtpServers,
-  selectLanguages,
-  selectKeyboard,
-  selectHostname,
-  selectUsers,
-  selectMetadata,
-  selectFirewall,
-  selectTemplate,
-  selectTemplateName,
   selectSatelliteCaCertificate,
   selectSatelliteRegistrationCommand,
-  selectModules,
+  selectServerUrl,
+  selectServices,
+  selectSnapshotDate,
+  selectTemplate,
+  selectTemplateName,
+  selectTimezone,
+  selectUseLatest,
+  selectUsers,
+  wizardState,
 } from '../../../store/wizardSlice';
 import isRhel from '../../../Utilities/isRhel';
 import { FileSystemConfigurationType } from '../steps/FileSystem';

src/Components/CreateImageWizard/utilities/useValidation.tsx

@@ -11,30 +11,30 @@ import { useAppSelector } from '../../../store/hooks';
 import { BlueprintsResponse } from '../../../store/imageBuilderApi';
 import { useShowActivationKeyQuery } from '../../../store/rhsmApi';
 import {
+  selectActivationKey,
+  selectBlueprintDescription,
   selectBlueprintId,
   selectBlueprintName,
-  selectBlueprintDescription,
   selectFileSystemConfigurationType,
-  selectFirstBootScript,
-  selectPartitions,
-  selectSnapshotDate,
-  selectUseLatest,
-  selectActivationKey,
-  selectRegistrationType,
-  selectHostname,
-  selectKernel,
-  selectUsers,
-  selectNtpServers,
   selectFirewall,
-  selectServices,
-  selectLanguages,
+  selectFirstBootScript,
+  selectHostname,
+  selectImageTypes,
+  selectKernel,
   selectKeyboard,
-  selectTimezone,
+  selectLanguages,
+  selectNtpServers,
+  selectPartitions,
+  selectRegistrationType,
   selectSatelliteCaCertificate,
   selectSatelliteRegistrationCommand,
-  selectImageTypes,
-  UserWithAdditionalInfo,
+  selectServices,
+  selectSnapshotDate,
   selectTemplate,
+  selectTimezone,
+  selectUseLatest,
+  selectUsers,
+  UserWithAdditionalInfo,
 } from '../../../store/wizardSlice';
 import { keyboardsList } from '../steps/Locale/keyboardsList';
 import { languagesList } from '../steps/Locale/languagesList';
@@ -43,17 +43,17 @@ import { timezones } from '../steps/Timezone/timezonesList';
 import {
   getDuplicateMountPoints,
   isBlueprintNameValid,
-  isMountpointMinSizeValid,
-  isSnapshotValid,
   isHostnameValid,
-  isUserNameValid,
-  isSshKeyValid,
-  isNtpServerValid,
   isKernelArgumentValid,
   isKernelNameValid,
+  isMountpointMinSizeValid,
+  isNtpServerValid,
   isPortValid,
   isServiceValid,
+  isSnapshotValid,
+  isSshKeyValid,
   isUserGroupValid,
+  isUserNameValid,
 } from '../validators';
 
 export type StepValidation = {

src/Components/ImagesTable/ClonesTable.tsx

@@ -3,7 +3,7 @@ import React, { useEffect, useState } from 'react';
 import { ClipboardCopy } from '@patternfly/react-core';
 import { Table, Tbody, Td, Th, Thead, Tr } from '@patternfly/react-table';
 
-import { StatusClone, AwsDetailsStatus } from './Status';
+import { AwsDetailsStatus, StatusClone } from './Status';
 
 import {
   ClonesResponseItem,

src/Components/ImagesTable/EmptyState.tsx

@@ -1,14 +1,14 @@
 import React from 'react';
 
 import {
-  Button,
-  EmptyState,
-  EmptyStateBody,
-  EmptyStateVariant,
-  Content,
-  EmptyStateActions,
-  EmptyStateFooter,
   Bullseye,
+  Button,
+  Content,
+  EmptyState,
+  EmptyStateActions,
+  EmptyStateBody,
+  EmptyStateFooter,
+  EmptyStateVariant,
 } from '@patternfly/react-core';
 import {
   ExternalLinkAltIcon,

src/Components/ImagesTable/ImageDetails.tsx

@@ -1,14 +1,14 @@
 import React, { useEffect, useState } from 'react';
 
 import {
+  Alert,
+  Button,
   ClipboardCopy,
   DescriptionList,
-  DescriptionListGroup,
   DescriptionListDescription,
+  DescriptionListGroup,
   DescriptionListTerm,
-  Button,
   Popover,
-  Alert,
   Skeleton,
 } from '@patternfly/react-core';
 import { ExternalLinkAltIcon } from '@patternfly/react-icons';

src/Components/ImagesTable/ImagesTable.tsx

@@ -1,17 +1,17 @@
 import React, { useEffect, useState } from 'react';
 
 import {
+  Alert,
+  Badge,
+  Bullseye,
+  Button,
+  PageSection,
   Pagination,
   PaginationVariant,
+  Spinner,
   Toolbar,
   ToolbarContent,
   ToolbarItem,
-  Alert,
-  Spinner,
-  Bullseye,
-  Badge,
-  Button,
-  PageSection,
 } from '@patternfly/react-core';
 import { OnSetPage } from '@patternfly/react-core/dist/esm/components/Pagination/Pagination';
 import {
@@ -42,11 +42,11 @@ import ImagesTableToolbar from './ImagesTableToolbar';
 import {
   AwsS3Instance,
   CloudInstance,
-  OciInstance,
   LocalInstance,
+  OciInstance,
 } from './Instance';
 import Release from './Release';
-import { ExpiringStatus, CloudStatus, LocalStatus } from './Status';
+import { CloudStatus, ExpiringStatus, LocalStatus } from './Status';
 import { AwsTarget, Target } from './Target';
 
 import {
@@ -59,10 +59,10 @@ import {
   STATUS_POLLING_INTERVAL,
 } from '../../constants';
 import {
-  useGetComposeStatusQuery,
-  useGetComposesQuery,
-  useGetBlueprintsQuery,
   useGetBlueprintComposesQuery,
+  useGetBlueprintsQuery,
+  useGetComposesQuery,
+  useGetComposeStatusQuery,
 } from '../../store/backendApi';
 import {
   selectBlueprintSearchInput,

src/Components/ImagesTable/ImagesTableToolbar.tsx

@@ -7,28 +7,28 @@ import {
   List,
   ListItem,
   Pagination,
+  Title,
   Toolbar,
   ToolbarContent,
   ToolbarItem,
-  Title,
 } from '@patternfly/react-core';
 
 import { useFixupBPWithNotification as useFixupBlueprintMutation } from '../../Hooks';
 import {
-  useGetBlueprintsQuery,
   useGetBlueprintQuery,
+  useGetBlueprintsQuery,
 } from '../../store/backendApi';
 import {
-  selectSelectedBlueprintId,
   selectBlueprintSearchInput,
   selectBlueprintVersionFilterAPI,
+  selectSelectedBlueprintId,
 } from '../../store/BlueprintSlice';
 import { useAppSelector } from '../../store/hooks';
 import {
   BlueprintItem,
-  useGetBlueprintComposesQuery,
   Distributions,
   GetBlueprintComposesApiArg,
+  useGetBlueprintComposesQuery,
 } from '../../store/imageBuilderApi';
 import { BlueprintActionsMenu } from '../Blueprints/BlueprintActionsMenu';
 import BlueprintDiffModal from '../Blueprints/BlueprintDiffModal';

src/Components/ImagesTable/Instance.tsx

@@ -33,8 +33,8 @@ import {
 } from '../../constants';
 import { useGetBlueprintsQuery, useGetComposeStatusQuery } from '../../store/backendApi';
 import {
-  selectSelectedBlueprintId,
   selectBlueprintSearchInput,
+  selectSelectedBlueprintId,
 } from '../../store/BlueprintSlice';
 import { LocalUploadStatus } from '../../store/cockpit/composerCloudApi';
 import { useAppSelector } from '../../store/hooks';
@@ -45,8 +45,8 @@ import {
   ImageTypes,
 } from '../../store/imageBuilderApi';
 import {
-  isAwsUploadRequestOptions,
   isAwss3UploadStatus,
+  isAwsUploadRequestOptions,
   isGcpUploadRequestOptions,
   isOciUploadStatus,
 } from '../../store/typeGuards';

src/Components/ImagesTable/Status.tsx

@@ -6,6 +6,7 @@ import {
   Button,
   CodeBlock,
   CodeBlockCode,
+  Content,
   Flex,
   Icon,
   Panel,
@@ -13,7 +14,6 @@ import {
   Popover,
   Skeleton,
   Spinner,
-  Content,
 } from '@patternfly/react-core';
 import {
   CheckCircleIcon,
@@ -34,9 +34,9 @@ import {
 import { useGetComposeStatusQuery } from '../../store/backendApi';
 import {
   ClonesResponseItem,
+  ComposesResponseItem,
   ComposeStatus,
   ComposeStatusError,
-  ComposesResponseItem,
   UploadStatus,
 } from '../../store/imageBuilderApi';
 

src/Components/LandingPage/NewAlert.tsx

@@ -4,9 +4,9 @@ import {
   Alert,
   AlertActionCloseButton,
   AlertActionLink,
+  Content,
   Flex,
   FlexItem,
-  Content,
 } from '@patternfly/react-core';
 
 // Import for optional quickstarts functionality

src/Components/ShareImageModal/RegionsSelect.tsx

@@ -1,24 +1,24 @@
-import React, { useState, useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 
 import {
   ActionGroup,
   Button,
   Form,
   FormGroup,
+  FormHelperText,
   HelperText,
   HelperTextItem,
-  FormHelperText,
   Label,
   LabelGroup,
+  MenuToggle,
   Popover,
   Select,
-  SelectOption,
   SelectList,
-  ValidatedOptions,
-  MenuToggle,
+  SelectOption,
   TextInputGroup,
   TextInputGroupMain,
   TextInputGroupUtilities,
+  ValidatedOptions,
 } from '@patternfly/react-core';
 import { MenuToggleElement } from '@patternfly/react-core/dist/esm/components/MenuToggle/MenuToggle';
 import {

src/Components/sharedComponents/ImageBuilderHeader.tsx

@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 
-import { Button, Popover, Content, Flex } from '@patternfly/react-core';
+import { Button, Content, Flex, Popover } from '@patternfly/react-core';
 import { ExternalLinkAltIcon, HelpIcon } from '@patternfly/react-icons';
 import {
   OpenSourceBadge,

src/Utilities/epel.ts

@@ -1,7 +1,7 @@
 import {
+  EPEL_10_REPO_DEFINITION,
   EPEL_8_REPO_DEFINITION,
   EPEL_9_REPO_DEFINITION,
-  EPEL_10_REPO_DEFINITION,
 } from '../constants';
 
 type EpelRepoDefinition = typeof EPEL_8_REPO_DEFINITION;

src/Utilities/isRhel.ts

@@ -1,9 +1,9 @@
 import {
+  RHEL_10,
+  RHEL_10_BETA,
   RHEL_8,
   RHEL_9,
   RHEL_9_BETA,
-  RHEL_10,
-  RHEL_10_BETA,
 } from '../constants';
 
 function isRhel(distro: string) {

src/Utilities/releaseToVersion.ts

@@ -1,4 +1,4 @@
-import { CENTOS_9, RHEL_8, RHEL_9, RHEL_10 } from '../constants';
+import { CENTOS_9, RHEL_10, RHEL_8, RHEL_9 } from '../constants';
 
 export const releaseToVersion = (release: string) => {
   switch (release) {

src/store/BlueprintSlice.ts

@@ -1,4 +1,4 @@
-import { PayloadAction, createSlice } from '@reduxjs/toolkit';
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
 import type { RootState } from '.';
 

src/store/cloudProviderConfigSlice.ts

@@ -1,4 +1,4 @@
-import { PayloadAction, createSlice } from '@reduxjs/toolkit';
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
 import type { CloudProviderConfigState } from './cockpit/types';
 

src/store/cockpit/baseQuery.ts

@@ -1,7 +1,7 @@
 import { BaseQueryFn } from '@reduxjs/toolkit/query';
 import cockpit from 'cockpit';
 
-import type { Method, Params, Headers } from './types.js';
+import type { Headers, Method, Params } from './types.js';
 
 export const baseQuery =
   (

src/store/cockpit/cockpitApi.ts

@@ -30,35 +30,35 @@ import {
 } from '../../Components/Blueprints/helpers/onPremToHostedBlueprintMapper';
 import { BLUEPRINTS_DIR } from '../../constants';
 import {
-  ComposeBlueprintApiResponse,
+  BlueprintItem,
   ComposeBlueprintApiArg,
-  CreateBlueprintRequest,
+  ComposeBlueprintApiResponse,
+  ComposeResponse,
   ComposesResponseItem,
-  GetArchitecturesApiResponse,
+  CreateBlueprintApiArg,
+  CreateBlueprintApiResponse,
+  CreateBlueprintRequest,
+  DeleteBlueprintApiArg,
+  DeleteBlueprintApiResponse,
+  DistributionProfileItem,
   GetArchitecturesApiArg,
-  GetBlueprintsApiArg,
-  GetBlueprintsApiResponse,
+  GetArchitecturesApiResponse,
+  GetBlueprintApiArg,
+  GetBlueprintApiResponse,
   GetBlueprintComposesApiArg,
   GetBlueprintComposesApiResponse,
+  GetBlueprintsApiArg,
+  GetBlueprintsApiResponse,
   GetComposesApiArg,
   GetComposesApiResponse,
   GetComposeStatusApiArg,
   GetComposeStatusApiResponse,
-  DeleteBlueprintApiResponse,
-  DeleteBlueprintApiArg,
-  BlueprintItem,
+  GetOscapCustomizationsApiArg,
+  GetOscapCustomizationsApiResponse,
   GetOscapProfilesApiArg,
   GetOscapProfilesApiResponse,
-  GetBlueprintApiResponse,
-  GetBlueprintApiArg,
-  CreateBlueprintApiResponse,
-  CreateBlueprintApiArg,
-  ComposeResponse,
-  UpdateBlueprintApiResponse,
   UpdateBlueprintApiArg,
-  DistributionProfileItem,
-  GetOscapCustomizationsApiResponse,
-  GetOscapCustomizationsApiArg,
+  UpdateBlueprintApiResponse,
 } from '../service/imageBuilderApi';
 
 const lookupDatastreamDistro = (distribution: string) => {

src/store/hooks.ts

@@ -1,6 +1,6 @@
 import { useDispatch, useSelector } from 'react-redux';
 
-import type { RootState, AppDispatch } from './index';
+import type { AppDispatch, RootState } from './index';
 
 // Use throughout your app instead of plain `useDispatch` and `useSelector`
 export const useAppDispatch = useDispatch.withTypes<AppDispatch>();

src/store/listenerMiddleware.ts

@@ -1,13 +1,13 @@
 // listenerMiddleware.ts
 // https://redux-toolkit.js.org/api/createListenerMiddleware#typescript-usage
 import {
-  createListenerMiddleware,
   addListener,
-  type TypedStartListening,
-  type TypedAddListener
+  createListenerMiddleware,
+  type TypedAddListener,
+  type TypedStartListening
 } from '@reduxjs/toolkit';
 
-import type { RootState, AppDispatch } from './index';
+import type { AppDispatch, RootState } from './index';
 
 export const listenerMiddleware = createListenerMiddleware();
 

src/store/typeGuards.ts

@@ -1,6 +1,6 @@
 import {
-  AwsUploadRequestOptions,
   Awss3UploadStatus,
+  AwsUploadRequestOptions,
   AzureUploadRequestOptions,
   AzureUploadStatus,
   GcpUploadRequestOptions,

src/store/wizardSlice.ts

@@ -1,4 +1,4 @@
-import { PayloadAction, createSlice } from '@reduxjs/toolkit';
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 import { v4 as uuidv4 } from 'uuid';
 
 import type { ApiRepositoryResponseRead } from './contentSourcesApi';

src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx

@@ -9,12 +9,12 @@ import {
 } from '../../../../../constants';
 import { mockBlueprintIds } from '../../../../fixtures/blueprints';
 import {
-  SCRIPT,
-  SCRIPT_DOS,
-  SCRIPT_WITHOUT_SHEBANG,
   baseCreateBlueprintRequest,
   firstBootCreateBlueprintRequest,
   firstBootData,
+  SCRIPT,
+  SCRIPT_DOS,
+  SCRIPT_WITHOUT_SHEBANG,
 } from '../../../../fixtures/editMode';
 import {
   blueprintRequest,

src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx

@@ -20,8 +20,8 @@ import {
   blueprintRequest,
   clickBack,
   clickNext,
-  clickReviewAndFinish,
   clickRegisterLater,
+  clickReviewAndFinish,
   enterBlueprintName,
   interceptBlueprintRequest,
   interceptEditBlueprintRequest,

src/test/Components/CreateImageWizard/steps/Registration/Registration.test.tsx

@@ -23,20 +23,20 @@ import {
 import { registrationCreateBlueprintRequest } from '../../../../fixtures/editMode';
 import { server } from '../../../../mocks/server';
 import {
-  enterBlueprintName,
-  renderCreateMode,
-  interceptBlueprintRequest,
-  goToRegistrationStep,
+  clickBack,
+  clickNext,
   clickRegisterLater,
-  renderEditMode,
+  clickRegisterSatellite,
+  clickReviewAndFinish,
+  enterBlueprintName,
+  getNextButton,
+  goToRegistrationStep,
+  interceptBlueprintRequest,
   interceptEditBlueprintRequest,
   openAndDismissSaveAndBuildModal,
-  clickNext,
-  clickBack,
+  renderCreateMode,
+  renderEditMode,
   verifyCancelButton,
-  clickReviewAndFinish,
-  getNextButton,
-  clickRegisterSatellite,
 } from '../../wizardTestUtils';
 
 const localStorageMock = (() => {

src/test/Components/CreateImageWizard/steps/Services/Services.test.tsx

@@ -16,12 +16,12 @@ import {
   clickRegisterLater,
   enterBlueprintName,
   interceptBlueprintRequest,
-  openAndDismissSaveAndBuildModal,
   interceptEditBlueprintRequest,
+  openAndDismissSaveAndBuildModal,
   renderCreateMode,
   renderEditMode,
-  verifyCancelButton,
   selectRhel9,
+  verifyCancelButton,
 } from '../../wizardTestUtils';
 
 let router: RemixRouter | undefined = undefined;

src/test/Components/ImagesTable/ImagesTable.test.tsx

@@ -2,9 +2,9 @@ import { screen, waitFor, within } from '@testing-library/react';
 import userEvent from '@testing-library/user-event';
 
 import {
-  mockComposes,
   mockClones,
   mockCloneStatus,
+  mockComposes,
 } from '../../fixtures/composes';
 import { renderCustomRoutesWithReduxRouter } from '../../testUtils';
 

src/test/fixtures/blueprints.ts

@@ -1,10 +1,10 @@
 import { RHEL_8, RHEL_9 } from '../../constants';
 import {
-  GetBlueprintsApiResponse,
   CreateBlueprintResponse,
-  GetBlueprintComposesApiResponse,
-  GetBlueprintApiResponse,
   Distributions,
+  GetBlueprintApiResponse,
+  GetBlueprintComposesApiResponse,
+  GetBlueprintsApiResponse,
 } from '../../store/imageBuilderApi';
 
 export const mockBlueprintsCreation: CreateBlueprintResponse[] = [

src/test/fixtures/composes.ts

@@ -2,9 +2,9 @@ import { RHEL_8, RHEL_9 } from '../../constants';
 import {
   AwsUploadStatus,
   ClonesResponse,
-  ComposeStatus,
   ComposesResponse,
   ComposesResponseItem,
+  ComposeStatus,
   UploadStatus,
 } from '../../store/imageBuilderApi';
 

src/test/fixtures/oscap.ts

@@ -1,8 +1,8 @@
 import { mockPolicies } from './compliance';
 
 import {
-  GetOscapProfilesApiResponse,
   GetOscapCustomizationsApiResponse,
+  GetOscapProfilesApiResponse,
 } from '../../store/imageBuilderApi';
 
 export const distributionOscapProfiles = (): GetOscapProfilesApiResponse => {

src/test/mocks/cockpit/cockpitHTTP.ts

@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-unused-vars */
 import path from 'path';
 
-import type { Method, Headers, Params } from '../../../store/cockpit/types';
+import type { Headers, Method, Params } from '../../../store/cockpit/types';
 import { mockStatus } from '../../fixtures/composes';
 
 type requestOptions = {

src/test/mocks/handlers.js

@@ -36,8 +36,8 @@ import {
 } from '../fixtures/oscap';
 import {
   mockPkgRecommendations,
-  mockSourcesPackagesResults,
   mockSourcesGroupsResults,
+  mockSourcesPackagesResults,
 } from '../fixtures/packages';
 import {
   mockPopularRepo,

src/test/testUtils.js

@@ -10,9 +10,9 @@ import LandingPage from '../Components/LandingPage/LandingPage';
 import ShareImageModal from '../Components/ShareImageModal/ShareImageModal';
 import {
   serviceMiddleware as middleware,
-  serviceReducer as reducer,
   onPremMiddleware as onPremMiddleware,
   onPremReducer as onPremReducer,
+  serviceReducer as reducer,
 } from '../store';
 import { resolveRelPath } from '../Utilities/path';