diff --git a/libs/i18n/locales/en/translation.json b/libs/i18n/locales/en/translation.json index 032ddf32..97a8c070 100644 --- a/libs/i18n/locales/en/translation.json +++ b/libs/i18n/locales/en/translation.json @@ -708,6 +708,7 @@ "URL": "URL", "Sync status": "Sync status", "Last transition": "Last transition", + "No Git repositories found": "No Git repositories found", "Use an existing Git repository": "Use an existing Git repository", "Use a new Git repository": "Use a new Git repository", "A resource sync is an automated Gitops method that helps manage your imported fleets by monitoring source repository changes and updating your fleet configuration accordingly.": "A resource sync is an automated Gitops method that helps manage your imported fleets by monitoring source repository changes and updating your fleet configuration accordingly.", diff --git a/libs/ui-components/src/components/Fleet/ImportFleetWizard/steps/RepositoryStep.tsx b/libs/ui-components/src/components/Fleet/ImportFleetWizard/steps/RepositoryStep.tsx index bb641f8e..f7252ef3 100644 --- a/libs/ui-components/src/components/Fleet/ImportFleetWizard/steps/RepositoryStep.tsx +++ b/libs/ui-components/src/components/Fleet/ImportFleetWizard/steps/RepositoryStep.tsx @@ -14,6 +14,7 @@ import FormSelect from '../../../form/FormSelect'; import FlightCtlForm from '../../../form/FlightCtlForm'; import { usePermissionsContext } from '../../../common/PermissionsContext'; import { RESOURCE, VERB } from '../../../../types/rbac'; +import WithTooltip from '../../../common/WithTooltip'; export const repositoryStepId = 'repository'; @@ -93,14 +94,16 @@ const RepositoryStep = ({ repositories, hasLoaded }: { repositories: Repository[ {canCreateRepo && ( - setFieldValue('useExistingRepo', true, true)} - id="existing-repo" - name="repo" - label={t('Use an existing Git repository')} - isDisabled={noRepositoriesExist} - /> + + setFieldValue('useExistingRepo', true, true)} + id="existing-repo" + name="repo" + label={t('Use an existing Git repository')} + isDisabled={noRepositoriesExist} + /> + setFieldValue('useExistingRepo', false, true)} diff --git a/libs/ui-components/src/components/Repository/CreateRepository/CreateRepositoryForm.css b/libs/ui-components/src/components/Repository/CreateRepository/CreateRepositoryForm.css index 6b192190..c4b2968d 100644 --- a/libs/ui-components/src/components/Repository/CreateRepository/CreateRepositoryForm.css +++ b/libs/ui-components/src/components/Repository/CreateRepository/CreateRepositoryForm.css @@ -3,5 +3,9 @@ } .fctl-create-repo__adv-section--nested { - margin-left: 1.5rem; + margin-left: 1.5rem; +} + +.fctl-create-repo__rs-checkbox { + --pf-v6-c-check__input--TranslateY: 0.75rem; } diff --git a/libs/ui-components/src/components/Repository/CreateRepository/CreateRepositoryForm.tsx b/libs/ui-components/src/components/Repository/CreateRepository/CreateRepositoryForm.tsx index eb70a60d..8f22f5fd 100644 --- a/libs/ui-components/src/components/Repository/CreateRepository/CreateRepositoryForm.tsx +++ b/libs/ui-components/src/components/Repository/CreateRepository/CreateRepositoryForm.tsx @@ -402,6 +402,7 @@ const CreateRepositoryFormContent = ({ isEdit, isReadOnly, onClose, children }: {showResourceSyncs && canCreateRS && (