forked from grafana/grafana
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
E2C: Use ConfirmModal for DisconnectModal (grafana#84279)
change disconnect modal to use confirmmodal
- Loading branch information
Showing
2 changed files
with
58 additions
and
54 deletions.
There are no files selected for viewing
73 changes: 42 additions & 31 deletions
73
public/app/features/admin/migrate-to-cloud/onprem/DisconnectModal.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,45 +1,56 @@ | ||
import React, { useState } from 'react'; | ||
import React, { useCallback } from 'react'; | ||
|
||
import { Modal, Button, Text } from '@grafana/ui'; | ||
import { Alert, ConfirmModal, Stack } from '@grafana/ui'; | ||
import { Trans, t } from 'app/core/internationalization'; | ||
|
||
import { useDisconnectStackMutation } from '../api'; | ||
|
||
interface Props { | ||
hideModal: () => void; | ||
onConfirm: () => Promise<{ data: void } | { error: unknown }>; | ||
isOpen: boolean; | ||
onDismiss: () => void; | ||
} | ||
|
||
export const DisconnectModal = ({ hideModal, onConfirm }: Props) => { | ||
const [isDisconnecting, setIsDisconnecting] = useState(false); | ||
export const DisconnectModal = ({ isOpen, onDismiss }: Props) => { | ||
const [disconnectStack, { isLoading, isError }] = useDisconnectStackMutation(); | ||
|
||
const onConfirmDisconnect = async () => { | ||
setIsDisconnecting(true); | ||
await onConfirm(); | ||
setIsDisconnecting(false); | ||
hideModal(); | ||
}; | ||
const handleConfirm = useCallback(async () => { | ||
const resp = await disconnectStack(); | ||
if (!('error' in resp)) { | ||
onDismiss(); | ||
} | ||
}, [disconnectStack, onDismiss]); | ||
|
||
return ( | ||
<Modal | ||
isOpen | ||
title={t('migrate-to-cloud.disconnect-modal.title', 'Disconnect from cloud stack')} | ||
onDismiss={hideModal} | ||
> | ||
<Text color="secondary"> | ||
const confirmBody = ( | ||
<Stack direction="column"> | ||
{isError && ( | ||
<Alert | ||
severity="error" | ||
title={t('migrate-to-cloud.disconnect-modal.error', 'There was an error disconnecting')} | ||
/> | ||
)} | ||
<div> | ||
<Trans i18nKey="migrate-to-cloud.disconnect-modal.body"> | ||
This will remove the migration token from this installation. If you wish to upload more resources in the | ||
future, you will need to enter a new migration token. | ||
</Trans> | ||
</Text> | ||
<Modal.ButtonRow> | ||
<Button variant="secondary" onClick={hideModal}> | ||
<Trans i18nKey="migrate-to-cloud.disconnect-modal.cancel">Cancel</Trans> | ||
</Button> | ||
<Button disabled={isDisconnecting} onClick={onConfirmDisconnect}> | ||
{isDisconnecting | ||
? t('migrate-to-cloud.disconnect-modal.disconnecting', 'Disconnecting...') | ||
: t('migrate-to-cloud.disconnect-modal.disconnect', 'Disconnect')} | ||
</Button> | ||
</Modal.ButtonRow> | ||
</Modal> | ||
</div> | ||
</Stack> | ||
); | ||
|
||
return ( | ||
<ConfirmModal | ||
isOpen={isOpen} | ||
title={t('migrate-to-cloud.disconnect-modal.title', 'Disconnect from cloud stack')} | ||
body={<></>} // body is mandatory prop, but i don't wanna | ||
description={confirmBody} | ||
confirmText={ | ||
isLoading | ||
? t('migrate-to-cloud.disconnect-modal.disconnecting', 'Disconnecting...') | ||
: t('migrate-to-cloud.disconnect-modal.disconnect', 'Disconnect') | ||
} | ||
dismissText={t('migrate-to-cloud.disconnect-modal.cancel', 'Cancel')} | ||
onConfirm={handleConfirm} | ||
onDismiss={onDismiss} | ||
/> | ||
); | ||
}; |
39 changes: 16 additions & 23 deletions
39
public/app/features/admin/migrate-to-cloud/onprem/Page.tsx
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,39 +1,32 @@ | ||
import React from 'react'; | ||
import React, { useState } from 'react'; | ||
|
||
import { Button, ModalsController, Stack, Text } from '@grafana/ui'; | ||
import { Button, Stack, Text } from '@grafana/ui'; | ||
import { Trans } from 'app/core/internationalization'; | ||
|
||
import { useDisconnectStackMutation, useGetStatusQuery } from '../api'; | ||
import { useGetStatusQuery } from '../api'; | ||
|
||
import { DisconnectModal } from './DisconnectModal'; | ||
import { EmptyState } from './EmptyState/EmptyState'; | ||
|
||
export const Page = () => { | ||
const { data, isFetching } = useGetStatusQuery(); | ||
const [disconnectStack, disconnectResponse] = useDisconnectStackMutation(); | ||
const [isDisconnecting, setIsDisconnecting] = useState(false); | ||
|
||
if (!data?.enabled) { | ||
return <EmptyState />; | ||
} | ||
|
||
return ( | ||
<ModalsController> | ||
{({ showModal, hideModal }) => ( | ||
<Stack alignItems="center"> | ||
{data.stackURL && <Text variant="h4">{data.stackURL}</Text>} | ||
<Button | ||
disabled={isFetching || disconnectResponse.isLoading} | ||
variant="secondary" | ||
onClick={() => | ||
showModal(DisconnectModal, { | ||
hideModal, | ||
onConfirm: disconnectStack, | ||
}) | ||
} | ||
> | ||
<Trans i18nKey="migrate-to-cloud.resources.disconnect">Disconnect</Trans> | ||
</Button> | ||
</Stack> | ||
)} | ||
</ModalsController> | ||
<> | ||
<Stack alignItems="center"> | ||
{data.stackURL && <Text variant="h4">{data.stackURL}</Text>} | ||
|
||
<Button disabled={isFetching || isDisconnecting} variant="secondary" onClick={() => setIsDisconnecting(true)}> | ||
<Trans i18nKey="migrate-to-cloud.resources.disconnect">Disconnect</Trans> | ||
</Button> | ||
</Stack> | ||
|
||
<DisconnectModal isOpen={isDisconnecting} onDismiss={() => setIsDisconnecting(false)} /> | ||
</> | ||
); | ||
}; |