From 813c06c5bdfd5933ccd8cf3e8c17f7c2e9fc015a Mon Sep 17 00:00:00 2001 From: regexowl Date: Fri, 3 May 2024 14:18:29 +0200 Subject: [PATCH] Utilities: Migrate remaining files to TypeScript This migrates remaining JavaScript files in Utilities to TypeScript. --- .../CreateImageWizard/steps/imageOutputStepMapper.js | 2 +- .../utilities/checkRepositoriesAvailability.ts | 2 +- ...vailability.js => checkRepositoriesAvailability.ts} | 8 +++++--- src/Utilities/{edge.js => edge.ts} | 10 ++++++---- src/Utilities/{isRhel.js => isRhel.ts} | 2 +- src/Utilities/{path.js => path.ts} | 0 .../{releaseToVersion.js => releaseToVersion.ts} | 2 +- .../{useGetEnvironment.js => useGetEnvironment.ts} | 0 ...ingPermissions.js => useProvisioningPermissions.ts} | 0 9 files changed, 15 insertions(+), 11 deletions(-) rename src/Utilities/{checkRepositoriesAvailability.js => checkRepositoriesAvailability.ts} (91%) rename src/Utilities/{edge.js => edge.ts} (73%) rename src/Utilities/{isRhel.js => isRhel.ts} (84%) rename src/Utilities/{path.js => path.ts} (100%) rename src/Utilities/{releaseToVersion.js => releaseToVersion.ts} (83%) rename src/Utilities/{useGetEnvironment.js => useGetEnvironment.ts} (100%) rename src/Utilities/{useProvisioningPermissions.js => useProvisioningPermissions.ts} (100%) diff --git a/src/Components/CreateImageWizard/steps/imageOutputStepMapper.js b/src/Components/CreateImageWizard/steps/imageOutputStepMapper.js index b80fc8f3..96738656 100644 --- a/src/Components/CreateImageWizard/steps/imageOutputStepMapper.js +++ b/src/Components/CreateImageWizard/steps/imageOutputStepMapper.js @@ -1,4 +1,4 @@ -import isRhel from '../../../Utilities/isRhel.js'; +import isRhel from '../../../Utilities/isRhel'; const imageOutputStepMapper = ( { 'target-environment': targetEnv, release, enableOscap } = {}, diff --git a/src/Components/CreateImageWizardV2/utilities/checkRepositoriesAvailability.ts b/src/Components/CreateImageWizardV2/utilities/checkRepositoriesAvailability.ts index edbf98d1..8fe98632 100644 --- a/src/Components/CreateImageWizardV2/utilities/checkRepositoriesAvailability.ts +++ b/src/Components/CreateImageWizardV2/utilities/checkRepositoriesAvailability.ts @@ -7,7 +7,7 @@ import { selectDistribution, selectCustomRepositories, } from '../../../store/wizardSlice'; -import { releaseToVersion } from '../../../Utilities/releaseToVersion.js'; +import { releaseToVersion } from '../../../Utilities/releaseToVersion'; /** * This checks the list of the custom repositories against a list of repos freshly diff --git a/src/Utilities/checkRepositoriesAvailability.js b/src/Utilities/checkRepositoriesAvailability.ts similarity index 91% rename from src/Utilities/checkRepositoriesAvailability.js rename to src/Utilities/checkRepositoriesAvailability.ts index 702b4ac9..0365875c 100644 --- a/src/Utilities/checkRepositoriesAvailability.js +++ b/src/Utilities/checkRepositoriesAvailability.ts @@ -50,8 +50,10 @@ export const useCheckRepositoriesAvailability = () => { ); const { data: freshRepos, isSuccess } = useMemo(() => { - if (firstRequest?.data?.meta?.count > 100) { - return { ...followupRequest }; + if (firstRequest?.data?.meta?.count) { + if (firstRequest?.data?.meta?.count > 100) { + return { ...followupRequest }; + } } return { ...firstRequest }; }, [firstRequest, followupRequest]); @@ -62,7 +64,7 @@ export const useCheckRepositoriesAvailability = () => { // Transform the fresh repos array into a Set to access its elements in O(1) // complexity later in the for loop. const freshReposUrls = new Set( - freshRepos.data.map((freshRepo) => freshRepo.url) + freshRepos.data?.map((freshRepo) => freshRepo.url) ); for (const payloadRepo of payloadRepositories) { if (!freshReposUrls.has(payloadRepo.baseurl)) { diff --git a/src/Utilities/edge.js b/src/Utilities/edge.ts similarity index 73% rename from src/Utilities/edge.js rename to src/Utilities/edge.ts index 536f08d0..7bab7033 100644 --- a/src/Utilities/edge.js +++ b/src/Utilities/edge.ts @@ -1,10 +1,11 @@ import { addNotification } from '@redhat-cloud-services/frontend-components-notifications/redux'; +import { Dispatch } from 'redux'; const manageEdgeImagesUrlName = 'manage-edge-images'; -const getNotificationProp = (dispatch) => { +const getNotificationProp = (dispatch: Dispatch) => { return { - hasInfo: (hasInfoMessage) => { + hasInfo: (hasInfoMessage: Notification) => { dispatch({ ...addNotification({ variant: 'info', @@ -12,7 +13,7 @@ const getNotificationProp = (dispatch) => { }), }); }, - hasSuccess: (hasSuccessMessage) => { + hasSuccess: (hasSuccessMessage: Notification) => { dispatch({ ...addNotification({ variant: 'success', @@ -20,7 +21,8 @@ const getNotificationProp = (dispatch) => { }), }); }, - err: (errMessage, err) => { + /* eslint-disable @typescript-eslint/no-explicit-any */ + err: (errMessage: any, err: any) => { dispatch({ ...addNotification({ variant: 'danger', diff --git a/src/Utilities/isRhel.js b/src/Utilities/isRhel.ts similarity index 84% rename from src/Utilities/isRhel.js rename to src/Utilities/isRhel.ts index 6e582073..9ad48a69 100644 --- a/src/Utilities/isRhel.js +++ b/src/Utilities/isRhel.ts @@ -1,6 +1,6 @@ import { RHEL_8, RHEL_9 } from '../constants'; -function isRhel(distro) { +function isRhel(distro: string) { switch (distro) { case RHEL_8: case RHEL_9: diff --git a/src/Utilities/path.js b/src/Utilities/path.ts similarity index 100% rename from src/Utilities/path.js rename to src/Utilities/path.ts diff --git a/src/Utilities/releaseToVersion.js b/src/Utilities/releaseToVersion.ts similarity index 83% rename from src/Utilities/releaseToVersion.js rename to src/Utilities/releaseToVersion.ts index a3f4ed72..58755297 100644 --- a/src/Utilities/releaseToVersion.js +++ b/src/Utilities/releaseToVersion.ts @@ -1,6 +1,6 @@ import { CENTOS_8, CENTOS_9, RHEL_8, RHEL_9 } from '../constants'; -export const releaseToVersion = (release) => { +export const releaseToVersion = (release: string) => { switch (release) { case RHEL_9: return '9'; diff --git a/src/Utilities/useGetEnvironment.js b/src/Utilities/useGetEnvironment.ts similarity index 100% rename from src/Utilities/useGetEnvironment.js rename to src/Utilities/useGetEnvironment.ts diff --git a/src/Utilities/useProvisioningPermissions.js b/src/Utilities/useProvisioningPermissions.ts similarity index 100% rename from src/Utilities/useProvisioningPermissions.js rename to src/Utilities/useProvisioningPermissions.ts