Provisioning: Move delete button to ConfigForm (#111865)

public/app/features/provisioning/Config/ConfigForm.tsx

@@ -23,9 +23,11 @@ import {
 } from 'app/api/clients/provisioning/v0alpha1';
 import { FormPrompt } from 'app/core/components/FormPrompt/FormPrompt';
 
+import { DeleteRepositoryButton } from '../Repository/DeleteRepositoryButton';
 import { TokenPermissionsInfo } from '../Shared/TokenPermissionsInfo';
 import { getGitProviderFields, getLocalProviderFields } from '../Wizard/fields';
 import { InlineSecureValueWarning } from '../components/InlineSecureValueWarning';
+import { PROVISIONING_URL } from '../constants';
 import { useCreateOrUpdateRepository } from '../hooks/useCreateOrUpdateRepository';
 import { RepositoryFormData } from '../types';
 import { dataToSpec } from '../utils/data';
@@ -358,6 +360,9 @@ export function ConfigForm({ data }: ConfigFormProps) {
               ? t('provisioning.config-form.button-saving', 'Saving...')
               : t('provisioning.config-form.button-save', 'Save')}
           </Button>
+          {repositoryName && data && (
+            <DeleteRepositoryButton name={repositoryName} repository={data} redirectTo={PROVISIONING_URL} />
+          )}
         </Stack>
       </Stack>
     </form>

public/app/features/provisioning/Repository/DeleteRepositoryButton.tsx

@@ -100,7 +100,7 @@ export function DeleteRepositoryButton({ name, repository, redirectTo }: Props)
           </Menu>
         }
       >
-        <Button variant="destructive" icon="trash-alt" disabled={isLoading}>
+        <Button variant="destructive" disabled={isLoading}>
           <Stack alignItems="center">
             <Trans i18nKey="provisioning.delete-repository-button.delete">Delete</Trans>
             <Icon name={'angle-down'} />

public/app/features/provisioning/Repository/RepositoryActions.tsx

@@ -8,7 +8,6 @@ import { getRepoHrefForProvider } from '../utils/git';
 import { getIsReadOnlyWorkflows } from '../utils/repository';
 import { getRepositoryTypeConfig } from '../utils/repositoryTypes';
 
-import { DeleteRepositoryButton } from './DeleteRepositoryButton';
 import { SyncRepository } from './SyncRepository';
 
 interface RepositoryActionsProps {
@@ -37,7 +36,6 @@ export function RepositoryActions({ repository }: RepositoryActionsProps) {
       <LinkButton variant="secondary" icon="cog" href={`${PROVISIONING_URL}/${name}/edit`}>
         <Trans i18nKey="provisioning.repository-actions.settings">Settings</Trans>
       </LinkButton>
-      <DeleteRepositoryButton name={name} repository={repository} redirectTo={PROVISIONING_URL} />
     </Stack>
   );
 }