From d4436dc6a97c24c6829700e41838ad44badee951 Mon Sep 17 00:00:00 2001 From: Gianluca Zuccarelli Date: Fri, 29 Nov 2024 14:01:07 +0000 Subject: [PATCH] multiple: set sane defaults Set sane defaults for some types rather than setting them to `undefined`. This is so that we can set `exactOptionalPropertyTypes` to true in our tsconfig. --- .../Blueprints/BuildImagesButton.tsx | 2 +- .../CreateImageWizard/CreateImageWizard.tsx | 4 ++-- .../CreateImageWizard/ValidatedTextInput.tsx | 18 +++++++++--------- .../steps/FileSystem/FileSystemTable.tsx | 2 +- .../steps/Repositories/Repositories.tsx | 2 +- .../steps/Review/Footer/CreateDropdown.tsx | 2 +- .../steps/Review/Footer/EditDropdown.tsx | 2 +- .../TargetEnvironment/Aws/AwsAccountId.tsx | 2 +- src/Components/ImagesTable/ImagesTable.tsx | 6 ++++-- .../ImagesTable/ImagesTableToolbar.tsx | 2 +- src/Components/ImagesTable/Target.tsx | 2 +- 11 files changed, 23 insertions(+), 21 deletions(-) diff --git a/src/Components/Blueprints/BuildImagesButton.tsx b/src/Components/Blueprints/BuildImagesButton.tsx index 7e5436e8..bdcaa639 100644 --- a/src/Components/Blueprints/BuildImagesButton.tsx +++ b/src/Components/Blueprints/BuildImagesButton.tsx @@ -179,7 +179,7 @@ export const BuildImagesButtonEmptyState = ({ onClick={onBuildHandler} isDisabled={!selectedBlueprintId} isLoading={imageBuildLoading} - variant={variant} + variant={variant || 'primary'} > {children ? children : 'Build images'} diff --git a/src/Components/CreateImageWizard/CreateImageWizard.tsx b/src/Components/CreateImageWizard/CreateImageWizard.tsx index 3ee03bff..d6b9b414 100644 --- a/src/Components/CreateImageWizard/CreateImageWizard.tsx +++ b/src/Components/CreateImageWizard/CreateImageWizard.tsx @@ -102,7 +102,7 @@ export const CustomWizardFooter = ({ ouiaId="wizard-back-btn" variant="secondary" onClick={goToPrevStep} - isDisabled={disableBack} + isDisabled={disableBack || false} > Back @@ -252,7 +252,7 @@ const CreateImageWizard = ({ isEdit }: CreateImageWizardProps) => { step.isDisabled || (isVisitRequired && !step.isVisited && !hasVisitedNextStep) } - isVisited={step.isVisited} + isVisited={step.isVisited || false} stepIndex={step.index} onClick={() => goToStepByIndex(step.index)} status={status} diff --git a/src/Components/CreateImageWizard/ValidatedTextInput.tsx b/src/Components/CreateImageWizard/ValidatedTextInput.tsx index 997001e1..60745034 100644 --- a/src/Components/CreateImageWizard/ValidatedTextInput.tsx +++ b/src/Components/CreateImageWizard/ValidatedTextInput.tsx @@ -63,14 +63,14 @@ export const HookValidatedInput = ({ {validated === 'error' && ( @@ -119,13 +119,13 @@ export const ValidatedTextInput = ({ {!isPristine && !validator(value) && ( diff --git a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx index 08d39602..b9dbfbfe 100644 --- a/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx +++ b/src/Components/CreateImageWizard/steps/FileSystem/FileSystemTable.tsx @@ -260,7 +260,7 @@ const MinimumSize = ({ partition }: MinimumSizePropTypes) => { warning={ partition.unit === 'B' ? 'The Wizard only supports KiB, MiB, or GiB. Adjust or keep the current value.' - : undefined + : '' } type="text" ouiaId="size" diff --git a/src/Components/CreateImageWizard/steps/Repositories/Repositories.tsx b/src/Components/CreateImageWizard/steps/Repositories/Repositories.tsx index d49a01e9..59396285 100644 --- a/src/Components/CreateImageWizard/steps/Repositories/Repositories.tsx +++ b/src/Components/CreateImageWizard/steps/Repositories/Repositories.tsx @@ -133,7 +133,7 @@ const Repositories = () => { url: toggleSelected === 'toggle-group-selected' ? [...selected].join(',') - : undefined, + : '', }, { refetchOnMountOrArgChange: 60 } ); diff --git a/src/Components/CreateImageWizard/steps/Review/Footer/CreateDropdown.tsx b/src/Components/CreateImageWizard/steps/Review/Footer/CreateDropdown.tsx index 1fb8d0fb..26d9e4e1 100644 --- a/src/Components/CreateImageWizard/steps/Review/Footer/CreateDropdown.tsx +++ b/src/Components/CreateImageWizard/steps/Review/Footer/CreateDropdown.tsx @@ -69,7 +69,7 @@ export const CreateSaveAndBuildBtn = ({ Create blueprint and build image(s) diff --git a/src/Components/CreateImageWizard/steps/Review/Footer/EditDropdown.tsx b/src/Components/CreateImageWizard/steps/Review/Footer/EditDropdown.tsx index dfb72781..9fcea79a 100644 --- a/src/Components/CreateImageWizard/steps/Review/Footer/EditDropdown.tsx +++ b/src/Components/CreateImageWizard/steps/Review/Footer/EditDropdown.tsx @@ -50,7 +50,7 @@ export const EditSaveAndBuildBtn = ({ Save changes and build image(s) diff --git a/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsAccountId.tsx b/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsAccountId.tsx index 3f3a1ec6..0f218208 100644 --- a/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsAccountId.tsx +++ b/src/Components/CreateImageWizard/steps/TargetEnvironment/Aws/AwsAccountId.tsx @@ -37,7 +37,7 @@ export const AwsAccountId = () => { readOnlyVariant="default" isRequired id="aws-account-id" - value={sourceId && data ? data.aws?.account_id : ''} + value={sourceId && data ? data.aws?.account_id ?? '' : ''} aria-label="aws account id" /> diff --git a/src/Components/ImagesTable/ImagesTable.tsx b/src/Components/ImagesTable/ImagesTable.tsx index 5cb5a88c..43324188 100644 --- a/src/Components/ImagesTable/ImagesTable.tsx +++ b/src/Components/ImagesTable/ImagesTable.tsx @@ -116,7 +116,7 @@ const ImagesTable = () => { id: selectedBlueprintId as string, limit: perPage, offset: perPage * (page - 1), - blueprintVersion: useAppSelector(selectBlueprintVersionFilterAPI), + blueprintVersion: useAppSelector(selectBlueprintVersionFilterAPI) ?? 1, }, { skip: !selectedBlueprintId } ); @@ -217,7 +217,9 @@ const ImagesTable = () => { - + diff --git a/src/Components/ImagesTable/ImagesTableToolbar.tsx b/src/Components/ImagesTable/ImagesTableToolbar.tsx index 53bb29e1..8124e619 100644 --- a/src/Components/ImagesTable/ImagesTableToolbar.tsx +++ b/src/Components/ImagesTable/ImagesTableToolbar.tsx @@ -60,7 +60,7 @@ const ImagesTableToolbar: React.FC = ({ id: selectedBlueprintId as string, limit: perPage, offset: perPage * (page - 1), - blueprintVersion: useAppSelector(selectBlueprintVersionFilterAPI), + blueprintVersion: useAppSelector(selectBlueprintVersionFilterAPI) ?? 1, }, { skip: !selectedBlueprintId } ); diff --git a/src/Components/ImagesTable/Target.tsx b/src/Components/ImagesTable/Target.tsx index 7dabbc2f..2b28f508 100644 --- a/src/Components/ImagesTable/Target.tsx +++ b/src/Components/ImagesTable/Target.tsx @@ -27,6 +27,6 @@ export const AwsTarget = ({ compose }: AwsTargetPropTypes) => { return ; } - const text = `${targetOptions.aws} (${data.data.length + 1})`; + const text = `${targetOptions.aws} (${data?.data?.length ?? 0 + 1})`; return <>{text}; };