From 25a5f140d833a62c5b9c6a4f03e1e81923c83b1e Mon Sep 17 00:00:00 2001 From: regexowl Date: Wed, 9 Jul 2025 13:43:09 +0200 Subject: [PATCH] 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 | 5 ++ playwright/Customizations/Filesystem.spec.ts | 8 +-- playwright/Customizations/Firewall.spec.ts | 8 +-- playwright/Customizations/Hostname.spec.ts | 8 +-- playwright/Customizations/Kernel.spec.ts | 8 +-- playwright/Customizations/Locale.spec.ts | 8 +-- playwright/Customizations/Systemd.spec.ts | 8 +-- playwright/Customizations/Timezone.spec.ts | 8 +-- playwright/helpers/helpers.ts | 2 +- playwright/helpers/login.ts | 2 +- src/Components/Blueprints/BlueprintCard.tsx | 4 +- .../Blueprints/BlueprintDiffModal.tsx | 2 +- .../Blueprints/BlueprintVersionFilter.tsx | 2 +- .../Blueprints/BlueprintsSideBar.tsx | 2 +- .../Blueprints/BuildImagesButton.tsx | 16 +++--- .../CreateImageWizard/CreateImageWizard.tsx | 38 ++++++------- .../CreateImageWizard/steps/Details/index.tsx | 2 +- .../components/FileSystemPartition.tsx | 2 +- .../FileSystem/components/FileSystemTable.tsx | 20 +++---- .../steps/FirstBoot/index.tsx | 4 +- .../components/ReleaseLifecycle.tsx | 4 +- .../ImageOutput/components/ReleaseSelect.tsx | 10 ++-- .../components/TargetEnvironment.tsx | 14 ++--- .../components/OscapProfileInformation.tsx | 6 +- .../steps/Oscap/components/PolicySelector.tsx | 22 ++++---- .../Oscap/components/ProfileSelector.tsx | 26 ++++----- .../CreateImageWizard/steps/Oscap/index.tsx | 16 +++--- .../steps/Oscap/removeBetaFromRelease.ts | 6 +- .../steps/Packages/PackageRecommendations.tsx | 4 +- .../steps/Packages/Packages.tsx | 42 +++++++------- .../Packages/components/CustomHelperText.tsx | 2 +- .../PackageInfoNotAvailablePopover.tsx | 2 +- .../Packages/components/RepoPopovers.tsx | 2 +- .../components/ActivationKeyInformation.tsx | 2 +- .../components/ActivationKeysList.tsx | 18 +++--- .../Registration/components/Registration.tsx | 2 +- .../steps/Registration/index.tsx | 4 +- .../steps/Repositories/Repositories.tsx | 16 +++--- .../steps/Repositories/components/Empty.tsx | 4 +- .../steps/Repositories/components/Loading.tsx | 2 +- .../steps/Repositories/index.tsx | 2 +- .../steps/Review/Footer/CreateDropdown.tsx | 10 ++-- .../steps/Review/Footer/EditDropdown.tsx | 6 +- .../steps/Review/Footer/Footer.tsx | 4 +- .../steps/Review/ReviewStep.tsx | 48 ++++++++-------- .../steps/Review/ReviewStepTables.tsx | 2 +- .../steps/Review/ReviewStepTextLists.tsx | 44 +++++++-------- .../CreateImageWizard/steps/Review/index.tsx | 2 +- .../steps/Snapshot/components/Snapshot.tsx | 8 +-- .../steps/Snapshot/components/Templates.tsx | 6 +- .../Snapshot/components/TemplatesEmpty.tsx | 4 +- .../steps/Snapshot/index.tsx | 2 +- .../TargetEnvironment/Aws/AwsAccountId.tsx | 2 +- .../Aws/AwsSourcesSelect.tsx | 4 +- .../steps/TargetEnvironment/Aws/index.tsx | 8 +-- .../Azure/AzureResourceGroups.tsx | 8 +-- .../Azure/AzureSourcesSelect.tsx | 12 ++-- .../steps/TargetEnvironment/Azure/index.tsx | 8 +-- .../steps/TargetEnvironment/Gcp/index.tsx | 8 +-- .../Timezone/components/TimezoneDropDown.tsx | 10 ++-- .../steps/Users/components/UserInfo.tsx | 20 +++---- .../CreateImageWizard/steps/Users/index.tsx | 2 +- .../utilities/PasswordValidatedInput.tsx | 2 +- .../checkRepositoriesAvailability.ts | 2 +- .../utilities/requestMapper.ts | 56 +++++++++---------- .../utilities/useValidation.tsx | 42 +++++++------- src/Components/ImagesTable/ClonesTable.tsx | 2 +- src/Components/ImagesTable/EmptyState.tsx | 14 ++--- src/Components/ImagesTable/ImageDetails.tsx | 6 +- src/Components/ImagesTable/ImagesTable.tsx | 22 ++++---- .../ImagesTable/ImagesTableToolbar.tsx | 8 +-- src/Components/ImagesTable/Instance.tsx | 4 +- src/Components/ImagesTable/Status.tsx | 4 +- src/Components/LandingPage/NewAlert.tsx | 2 +- .../ShareImageModal/RegionsSelect.tsx | 10 ++-- .../sharedComponents/ImageBuilderHeader.tsx | 2 +- src/Utilities/epel.ts | 2 +- src/Utilities/isRhel.ts | 4 +- src/Utilities/releaseToVersion.ts | 2 +- src/store/BlueprintSlice.ts | 2 +- src/store/cloudProviderConfigSlice.ts | 2 +- src/store/cockpit/baseQuery.ts | 2 +- src/store/cockpit/cockpitApi.ts | 34 +++++------ src/store/hooks.ts | 2 +- src/store/listenerMiddleware.ts | 8 +-- src/store/typeGuards.ts | 2 +- src/store/wizardSlice.ts | 2 +- .../steps/FirstBoot/Firstboot.test.tsx | 6 +- .../steps/Packages/Packages.test.tsx | 2 +- .../steps/Registration/Registration.test.tsx | 20 +++---- .../steps/Services/Services.test.tsx | 4 +- .../ImagesTable/ImagesTable.test.tsx | 2 +- src/test/fixtures/blueprints.ts | 6 +- src/test/fixtures/composes.ts | 2 +- src/test/fixtures/oscap.ts | 2 +- src/test/mocks/cockpit/cockpitHTTP.ts | 2 +- src/test/mocks/handlers.js | 2 +- src/test/testUtils.js | 2 +- 98 files changed, 437 insertions(+), 432 deletions(-) diff --git a/eslint.config.js b/eslint.config.js index 7f27fed0..cb0480e1 100644 --- a/eslint.config.js +++ b/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', diff --git a/playwright/Customizations/Filesystem.spec.ts b/playwright/Customizations/Filesystem.spec.ts index 4fc4829d..cedcb52d 100644 --- a/playwright/Customizations/Filesystem.spec.ts +++ b/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 ({ diff --git a/playwright/Customizations/Firewall.spec.ts b/playwright/Customizations/Firewall.spec.ts index c228ef7b..c201f7ac 100644 --- a/playwright/Customizations/Firewall.spec.ts +++ b/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 ({ diff --git a/playwright/Customizations/Hostname.spec.ts b/playwright/Customizations/Hostname.spec.ts index 2a0779cf..dcb65af2 100644 --- a/playwright/Customizations/Hostname.spec.ts +++ b/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 ({ diff --git a/playwright/Customizations/Kernel.spec.ts b/playwright/Customizations/Kernel.spec.ts index a3c531ff..c385cbe1 100644 --- a/playwright/Customizations/Kernel.spec.ts +++ b/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 ({ diff --git a/playwright/Customizations/Locale.spec.ts b/playwright/Customizations/Locale.spec.ts index 9f0bfe1a..1d1e491a 100644 --- a/playwright/Customizations/Locale.spec.ts +++ b/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 ({ diff --git a/playwright/Customizations/Systemd.spec.ts b/playwright/Customizations/Systemd.spec.ts index 0ad7ba1a..dec29c30 100644 --- a/playwright/Customizations/Systemd.spec.ts +++ b/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 ({ diff --git a/playwright/Customizations/Timezone.spec.ts b/playwright/Customizations/Timezone.spec.ts index 90ab00c4..f625559a 100644 --- a/playwright/Customizations/Timezone.spec.ts +++ b/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 ({ diff --git a/playwright/helpers/helpers.ts b/playwright/helpers/helpers.ts index 69e105c7..33291ac0 100644 --- a/playwright/helpers/helpers.ts +++ b/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'); diff --git a/playwright/helpers/login.ts b/playwright/helpers/login.ts index fa3fc650..2e33e024 100644 --- a/playwright/helpers/login.ts +++ b/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'; diff --git a/src/Components/Blueprints/BlueprintCard.tsx b/src/Components/Blueprints/BlueprintCard.tsx index d79fc16a..e77cb953 100644 --- a/src/Components/Blueprints/BlueprintCard.tsx +++ b/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'; diff --git a/src/Components/Blueprints/BlueprintDiffModal.tsx b/src/Components/Blueprints/BlueprintDiffModal.tsx index 1da27ba2..28cf5868 100644 --- a/src/Components/Blueprints/BlueprintDiffModal.tsx +++ b/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'; diff --git a/src/Components/Blueprints/BlueprintVersionFilter.tsx b/src/Components/Blueprints/BlueprintVersionFilter.tsx index c093c825..7d7b885e 100644 --- a/src/Components/Blueprints/BlueprintVersionFilter.tsx +++ b/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'; diff --git a/src/Components/Blueprints/BlueprintsSideBar.tsx b/src/Components/Blueprints/BlueprintsSideBar.tsx index 5628725e..035be843 100644 --- a/src/Components/Blueprints/BlueprintsSideBar.tsx +++ b/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 { diff --git a/src/Components/Blueprints/BuildImagesButton.tsx b/src/Components/Blueprints/BuildImagesButton.tsx index 4dc95952..5d505704 100644 --- a/src/Components/Blueprints/BuildImagesButton.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/CreateImageWizard.tsx b/src/Components/CreateImageWizard/CreateImageWizard.tsx index c582e4d0..7a86b14e 100644 --- a/src/Components/CreateImageWizard/CreateImageWizard.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Details/index.tsx b/src/Components/CreateImageWizard/steps/Details/index.tsx index eaaeba42..0e19316b 100644 --- a/src/Components/CreateImageWizard/steps/Details/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemPartition.tsx b/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemPartition.tsx index 02b37238..8d24a3dd 100644 --- a/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemPartition.tsx +++ b/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 = () => { diff --git a/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemTable.tsx b/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemTable.tsx index 40dc8f90..93e3aa76 100644 --- a/src/Components/CreateImageWizard/steps/FileSystem/components/FileSystemTable.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/FirstBoot/index.tsx b/src/Components/CreateImageWizard/steps/FirstBoot/index.tsx index de97a068..100d3ecf 100644 --- a/src/Components/CreateImageWizard/steps/FirstBoot/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/ImageOutput/components/ReleaseLifecycle.tsx b/src/Components/CreateImageWizard/steps/ImageOutput/components/ReleaseLifecycle.tsx index 8439a871..adba3c71 100644 --- a/src/Components/CreateImageWizard/steps/ImageOutput/components/ReleaseLifecycle.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/ImageOutput/components/ReleaseSelect.tsx b/src/Components/CreateImageWizard/steps/ImageOutput/components/ReleaseSelect.tsx index 954d5b4b..620e067b 100644 --- a/src/Components/CreateImageWizard/steps/ImageOutput/components/ReleaseSelect.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/ImageOutput/components/TargetEnvironment.tsx b/src/Components/CreateImageWizard/steps/ImageOutput/components/TargetEnvironment.tsx index 9e2b8718..fd4093ff 100644 --- a/src/Components/CreateImageWizard/steps/ImageOutput/components/TargetEnvironment.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Oscap/components/OscapProfileInformation.tsx b/src/Components/CreateImageWizard/steps/Oscap/components/OscapProfileInformation.tsx index 4e12d822..8ecde737 100644 --- a/src/Components/CreateImageWizard/steps/Oscap/components/OscapProfileInformation.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Oscap/components/PolicySelector.tsx b/src/Components/CreateImageWizard/steps/Oscap/components/PolicySelector.tsx index 29bdffe3..2b225a27 100644 --- a/src/Components/CreateImageWizard/steps/Oscap/components/PolicySelector.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Oscap/components/ProfileSelector.tsx b/src/Components/CreateImageWizard/steps/Oscap/components/ProfileSelector.tsx index 8aa4b9ed..60fe0936 100644 --- a/src/Components/CreateImageWizard/steps/Oscap/components/ProfileSelector.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Oscap/index.tsx b/src/Components/CreateImageWizard/steps/Oscap/index.tsx index 51654761..7dcfe331 100644 --- a/src/Components/CreateImageWizard/steps/Oscap/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Oscap/removeBetaFromRelease.ts b/src/Components/CreateImageWizard/steps/Oscap/removeBetaFromRelease.ts index 3ad16b9c..de8155c5 100644 --- a/src/Components/CreateImageWizard/steps/Oscap/removeBetaFromRelease.ts +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Packages/PackageRecommendations.tsx b/src/Components/CreateImageWizard/steps/Packages/PackageRecommendations.tsx index c84b693d..fc5fdea6 100644 --- a/src/Components/CreateImageWizard/steps/Packages/PackageRecommendations.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Packages/Packages.tsx b/src/Components/CreateImageWizard/steps/Packages/Packages.tsx index 837d2f81..3d17f50e 100644 --- a/src/Components/CreateImageWizard/steps/Packages/Packages.tsx +++ b/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 { diff --git a/src/Components/CreateImageWizard/steps/Packages/components/CustomHelperText.tsx b/src/Components/CreateImageWizard/steps/Packages/components/CustomHelperText.tsx index 523c3125..d8adee5d 100644 --- a/src/Components/CreateImageWizard/steps/Packages/components/CustomHelperText.tsx +++ b/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 = diff --git a/src/Components/CreateImageWizard/steps/Packages/components/PackageInfoNotAvailablePopover.tsx b/src/Components/CreateImageWizard/steps/Packages/components/PackageInfoNotAvailablePopover.tsx index 62e77a96..e802b806 100644 --- a/src/Components/CreateImageWizard/steps/Packages/components/PackageInfoNotAvailablePopover.tsx +++ b/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 = () => { diff --git a/src/Components/CreateImageWizard/steps/Packages/components/RepoPopovers.tsx b/src/Components/CreateImageWizard/steps/Packages/components/RepoPopovers.tsx index d92ab5dd..af8b8edb 100644 --- a/src/Components/CreateImageWizard/steps/Packages/components/RepoPopovers.tsx +++ b/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 = () => { diff --git a/src/Components/CreateImageWizard/steps/Registration/components/ActivationKeyInformation.tsx b/src/Components/CreateImageWizard/steps/Registration/components/ActivationKeyInformation.tsx index d2c0df53..12aea39a 100644 --- a/src/Components/CreateImageWizard/steps/Registration/components/ActivationKeyInformation.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Registration/components/ActivationKeysList.tsx b/src/Components/CreateImageWizard/steps/Registration/components/ActivationKeysList.tsx index 7bfcb718..4a2b27d8 100644 --- a/src/Components/CreateImageWizard/steps/Registration/components/ActivationKeysList.tsx +++ b/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, diff --git a/src/Components/CreateImageWizard/steps/Registration/components/Registration.tsx b/src/Components/CreateImageWizard/steps/Registration/components/Registration.tsx index 40c83b4d..e19a2030 100644 --- a/src/Components/CreateImageWizard/steps/Registration/components/Registration.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Registration/index.tsx b/src/Components/CreateImageWizard/steps/Registration/index.tsx index 82564f17..12400170 100644 --- a/src/Components/CreateImageWizard/steps/Registration/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Repositories/Repositories.tsx b/src/Components/CreateImageWizard/steps/Repositories/Repositories.tsx index 58d71572..55f6c06b 100644 --- a/src/Components/CreateImageWizard/steps/Repositories/Repositories.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Repositories/components/Empty.tsx b/src/Components/CreateImageWizard/steps/Repositories/components/Empty.tsx index 60980650..ff64ea0a 100644 --- a/src/Components/CreateImageWizard/steps/Repositories/components/Empty.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Repositories/components/Loading.tsx b/src/Components/CreateImageWizard/steps/Repositories/components/Loading.tsx index 4c10af8f..6a999be0 100644 --- a/src/Components/CreateImageWizard/steps/Repositories/components/Loading.tsx +++ b/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 ( diff --git a/src/Components/CreateImageWizard/steps/Repositories/index.tsx b/src/Components/CreateImageWizard/steps/Repositories/index.tsx index c9f1ac0a..8c4aa2d2 100644 --- a/src/Components/CreateImageWizard/steps/Repositories/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Review/Footer/CreateDropdown.tsx b/src/Components/CreateImageWizard/steps/Review/Footer/CreateDropdown.tsx index b45a4cf4..d9ee3d82 100644 --- a/src/Components/CreateImageWizard/steps/Review/Footer/CreateDropdown.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Review/Footer/EditDropdown.tsx b/src/Components/CreateImageWizard/steps/Review/Footer/EditDropdown.tsx index 6be18a8c..b3325b13 100644 --- a/src/Components/CreateImageWizard/steps/Review/Footer/EditDropdown.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Review/Footer/Footer.tsx b/src/Components/CreateImageWizard/steps/Review/Footer/Footer.tsx index cc2e8f35..d1745c5f 100644 --- a/src/Components/CreateImageWizard/steps/Review/Footer/Footer.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx b/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx index b58e9ab5..9e515428 100644 --- a/src/Components/CreateImageWizard/steps/Review/ReviewStep.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Review/ReviewStepTables.tsx b/src/Components/CreateImageWizard/steps/Review/ReviewStepTables.tsx index 607afa23..c44f4902 100644 --- a/src/Components/CreateImageWizard/steps/Review/ReviewStepTables.tsx +++ b/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, diff --git a/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx b/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx index 3ef3392a..6a539ac3 100644 --- a/src/Components/CreateImageWizard/steps/Review/ReviewStepTextLists.tsx +++ b/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 { diff --git a/src/Components/CreateImageWizard/steps/Review/index.tsx b/src/Components/CreateImageWizard/steps/Review/index.tsx index 944b39dd..e6ed229b 100644 --- a/src/Components/CreateImageWizard/steps/Review/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Snapshot/components/Snapshot.tsx b/src/Components/CreateImageWizard/steps/Snapshot/components/Snapshot.tsx index 80ffe53f..b9f8d536 100644 --- a/src/Components/CreateImageWizard/steps/Snapshot/components/Snapshot.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Snapshot/components/Templates.tsx b/src/Components/CreateImageWizard/steps/Snapshot/components/Templates.tsx index 03df5ea9..d30f581d 100644 --- a/src/Components/CreateImageWizard/steps/Snapshot/components/Templates.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Snapshot/components/TemplatesEmpty.tsx b/src/Components/CreateImageWizard/steps/Snapshot/components/TemplatesEmpty.tsx index e578575b..9a4f3094 100644 --- a/src/Components/CreateImageWizard/steps/Snapshot/components/TemplatesEmpty.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Snapshot/index.tsx b/src/Components/CreateImageWizard/steps/Snapshot/index.tsx index f0bef854..fb9e68f8 100644 --- a/src/Components/CreateImageWizard/steps/Snapshot/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsAccountId.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsAccountId.tsx index 1b9f0b51..e8ce5597 100644 --- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsAccountId.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsSourcesSelect.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsSourcesSelect.tsx index f7c62d84..b28cf4ea 100644 --- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsSourcesSelect.tsx +++ b/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, diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/index.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/index.tsx index 58276242..a5c7d6ef 100644 --- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureResourceGroups.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureResourceGroups.tsx index cf50399d..70218bda 100644 --- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureResourceGroups.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureSourcesSelect.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureSourcesSelect.tsx index fcedc100..22df5640 100644 --- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/AzureSourcesSelect.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx index 5db43ea0..f88ca249 100644 --- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Azure/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Gcp/index.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Gcp/index.tsx index 33145fd7..d85c16bf 100644 --- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Gcp/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx b/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx index adeba4af..4144a108 100644 --- a/src/Components/CreateImageWizard/steps/Timezone/components/TimezoneDropDown.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Users/components/UserInfo.tsx b/src/Components/CreateImageWizard/steps/Users/components/UserInfo.tsx index 41ca0b9c..e18bb78d 100644 --- a/src/Components/CreateImageWizard/steps/Users/components/UserInfo.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/steps/Users/index.tsx b/src/Components/CreateImageWizard/steps/Users/index.tsx index ba9012ef..da619bf2 100644 --- a/src/Components/CreateImageWizard/steps/Users/index.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/utilities/PasswordValidatedInput.tsx b/src/Components/CreateImageWizard/utilities/PasswordValidatedInput.tsx index f171b7b3..6cc85c7e 100644 --- a/src/Components/CreateImageWizard/utilities/PasswordValidatedInput.tsx +++ b/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'; diff --git a/src/Components/CreateImageWizard/utilities/checkRepositoriesAvailability.ts b/src/Components/CreateImageWizard/utilities/checkRepositoriesAvailability.ts index 9c962fdc..1bdef4ed 100644 --- a/src/Components/CreateImageWizard/utilities/checkRepositoriesAvailability.ts +++ b/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'; diff --git a/src/Components/CreateImageWizard/utilities/requestMapper.ts b/src/Components/CreateImageWizard/utilities/requestMapper.ts index d9b06b1d..3b496da0 100644 --- a/src/Components/CreateImageWizard/utilities/requestMapper.ts +++ b/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'; diff --git a/src/Components/CreateImageWizard/utilities/useValidation.tsx b/src/Components/CreateImageWizard/utilities/useValidation.tsx index f4621b1c..a5b49803 100644 --- a/src/Components/CreateImageWizard/utilities/useValidation.tsx +++ b/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 = { diff --git a/src/Components/ImagesTable/ClonesTable.tsx b/src/Components/ImagesTable/ClonesTable.tsx index 50d424ef..436e1459 100644 --- a/src/Components/ImagesTable/ClonesTable.tsx +++ b/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, diff --git a/src/Components/ImagesTable/EmptyState.tsx b/src/Components/ImagesTable/EmptyState.tsx index 14eec227..f4692963 100644 --- a/src/Components/ImagesTable/EmptyState.tsx +++ b/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, diff --git a/src/Components/ImagesTable/ImageDetails.tsx b/src/Components/ImagesTable/ImageDetails.tsx index ebf4cbfa..45cca690 100644 --- a/src/Components/ImagesTable/ImageDetails.tsx +++ b/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'; diff --git a/src/Components/ImagesTable/ImagesTable.tsx b/src/Components/ImagesTable/ImagesTable.tsx index 055cffa3..0afa06cf 100644 --- a/src/Components/ImagesTable/ImagesTable.tsx +++ b/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, diff --git a/src/Components/ImagesTable/ImagesTableToolbar.tsx b/src/Components/ImagesTable/ImagesTableToolbar.tsx index 017aab57..65bd0d6b 100644 --- a/src/Components/ImagesTable/ImagesTableToolbar.tsx +++ b/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'; diff --git a/src/Components/ImagesTable/Instance.tsx b/src/Components/ImagesTable/Instance.tsx index 43967979..28a903bf 100644 --- a/src/Components/ImagesTable/Instance.tsx +++ b/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'; diff --git a/src/Components/ImagesTable/Status.tsx b/src/Components/ImagesTable/Status.tsx index 7ff7ee31..61577e2a 100644 --- a/src/Components/ImagesTable/Status.tsx +++ b/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'; diff --git a/src/Components/LandingPage/NewAlert.tsx b/src/Components/LandingPage/NewAlert.tsx index 7986b458..2a38e143 100644 --- a/src/Components/LandingPage/NewAlert.tsx +++ b/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 diff --git a/src/Components/ShareImageModal/RegionsSelect.tsx b/src/Components/ShareImageModal/RegionsSelect.tsx index d1766d09..a508f3f1 100644 --- a/src/Components/ShareImageModal/RegionsSelect.tsx +++ b/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 { diff --git a/src/Components/sharedComponents/ImageBuilderHeader.tsx b/src/Components/sharedComponents/ImageBuilderHeader.tsx index 6e7ef3e4..954fd48b 100644 --- a/src/Components/sharedComponents/ImageBuilderHeader.tsx +++ b/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, diff --git a/src/Utilities/epel.ts b/src/Utilities/epel.ts index a8c442bd..09005536 100644 --- a/src/Utilities/epel.ts +++ b/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; diff --git a/src/Utilities/isRhel.ts b/src/Utilities/isRhel.ts index c824fd7a..a43ef4bd 100644 --- a/src/Utilities/isRhel.ts +++ b/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) { diff --git a/src/Utilities/releaseToVersion.ts b/src/Utilities/releaseToVersion.ts index 22363820..5459f803 100644 --- a/src/Utilities/releaseToVersion.ts +++ b/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) { diff --git a/src/store/BlueprintSlice.ts b/src/store/BlueprintSlice.ts index 43940bf9..cc18a3e8 100644 --- a/src/store/BlueprintSlice.ts +++ b/src/store/BlueprintSlice.ts @@ -1,4 +1,4 @@ -import { PayloadAction, createSlice } from '@reduxjs/toolkit'; +import { createSlice, PayloadAction } from '@reduxjs/toolkit'; import type { RootState } from '.'; diff --git a/src/store/cloudProviderConfigSlice.ts b/src/store/cloudProviderConfigSlice.ts index 6dc03adc..6ffc4086 100644 --- a/src/store/cloudProviderConfigSlice.ts +++ b/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'; diff --git a/src/store/cockpit/baseQuery.ts b/src/store/cockpit/baseQuery.ts index 0f253726..482204a2 100644 --- a/src/store/cockpit/baseQuery.ts +++ b/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 = ( diff --git a/src/store/cockpit/cockpitApi.ts b/src/store/cockpit/cockpitApi.ts index 52afd13b..6caee6af 100644 --- a/src/store/cockpit/cockpitApi.ts +++ b/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) => { diff --git a/src/store/hooks.ts b/src/store/hooks.ts index 2117db80..eae34b13 100644 --- a/src/store/hooks.ts +++ b/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(); diff --git a/src/store/listenerMiddleware.ts b/src/store/listenerMiddleware.ts index f5c089d0..a1fd379b 100644 --- a/src/store/listenerMiddleware.ts +++ b/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(); diff --git a/src/store/typeGuards.ts b/src/store/typeGuards.ts index ed5c5aec..fbcfceca 100644 --- a/src/store/typeGuards.ts +++ b/src/store/typeGuards.ts @@ -1,6 +1,6 @@ import { - AwsUploadRequestOptions, Awss3UploadStatus, + AwsUploadRequestOptions, AzureUploadRequestOptions, AzureUploadStatus, GcpUploadRequestOptions, diff --git a/src/store/wizardSlice.ts b/src/store/wizardSlice.ts index 8b288f6e..ada5f2c6 100644 --- a/src/store/wizardSlice.ts +++ b/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'; diff --git a/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx b/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx index 50643413..c0999e20 100644 --- a/src/test/Components/CreateImageWizard/steps/FirstBoot/Firstboot.test.tsx +++ b/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, diff --git a/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx b/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx index 7efb8536..906769c7 100644 --- a/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx +++ b/src/test/Components/CreateImageWizard/steps/Packages/Packages.test.tsx @@ -20,8 +20,8 @@ import { blueprintRequest, clickBack, clickNext, - clickReviewAndFinish, clickRegisterLater, + clickReviewAndFinish, enterBlueprintName, interceptBlueprintRequest, interceptEditBlueprintRequest, diff --git a/src/test/Components/CreateImageWizard/steps/Registration/Registration.test.tsx b/src/test/Components/CreateImageWizard/steps/Registration/Registration.test.tsx index e17372c7..f6968a02 100644 --- a/src/test/Components/CreateImageWizard/steps/Registration/Registration.test.tsx +++ b/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 = (() => { diff --git a/src/test/Components/CreateImageWizard/steps/Services/Services.test.tsx b/src/test/Components/CreateImageWizard/steps/Services/Services.test.tsx index d66b93c4..8a2c9106 100644 --- a/src/test/Components/CreateImageWizard/steps/Services/Services.test.tsx +++ b/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; diff --git a/src/test/Components/ImagesTable/ImagesTable.test.tsx b/src/test/Components/ImagesTable/ImagesTable.test.tsx index a945c988..532420c5 100644 --- a/src/test/Components/ImagesTable/ImagesTable.test.tsx +++ b/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'; diff --git a/src/test/fixtures/blueprints.ts b/src/test/fixtures/blueprints.ts index a148a9c0..24bbb4eb 100644 --- a/src/test/fixtures/blueprints.ts +++ b/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[] = [ diff --git a/src/test/fixtures/composes.ts b/src/test/fixtures/composes.ts index 3b600172..7db69faf 100644 --- a/src/test/fixtures/composes.ts +++ b/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'; diff --git a/src/test/fixtures/oscap.ts b/src/test/fixtures/oscap.ts index 5621a0b2..60ff8fad 100644 --- a/src/test/fixtures/oscap.ts +++ b/src/test/fixtures/oscap.ts @@ -1,8 +1,8 @@ import { mockPolicies } from './compliance'; import { - GetOscapProfilesApiResponse, GetOscapCustomizationsApiResponse, + GetOscapProfilesApiResponse, } from '../../store/imageBuilderApi'; export const distributionOscapProfiles = (): GetOscapProfilesApiResponse => { diff --git a/src/test/mocks/cockpit/cockpitHTTP.ts b/src/test/mocks/cockpit/cockpitHTTP.ts index 3a0fdb55..cf39216e 100644 --- a/src/test/mocks/cockpit/cockpitHTTP.ts +++ b/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 = { diff --git a/src/test/mocks/handlers.js b/src/test/mocks/handlers.js index 55157cea..b02807f6 100644 --- a/src/test/mocks/handlers.js +++ b/src/test/mocks/handlers.js @@ -36,8 +36,8 @@ import { } from '../fixtures/oscap'; import { mockPkgRecommendations, - mockSourcesPackagesResults, mockSourcesGroupsResults, + mockSourcesPackagesResults, } from '../fixtures/packages'; import { mockPopularRepo, diff --git a/src/test/testUtils.js b/src/test/testUtils.js index a7a88451..fc6f3e02 100644 --- a/src/test/testUtils.js +++ b/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';