colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add delete confirmation dialog

This commit is contained in:
Tert0 2022-10-07 18:00:28 +02:00 committed by Jannis Mattheis
parent 0250a48c2c
commit 17b9b52d95
2 changed files with 20 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ui/src/message/Messages.tsx
View File

@ -11,6 +11,7 @@ import {inject, Stores} from '../inject';
import {observable} from 'mobx'; import {observable} from 'mobx';
import ReactInfinite from 'react-infinite'; import ReactInfinite from 'react-infinite';
import {IMessage} from '../types'; import {IMessage} from '../types';
import ConfirmDialog from "../common/ConfirmDialog";
type IProps = RouteComponentProps<{id: string}>; type IProps = RouteComponentProps<{id: string}>;
@ -22,6 +23,8 @@ interface IState {
class Messages extends Component<IProps & Stores<'messagesStore' | 'appStore'>, IState> { class Messages extends Component<IProps & Stores<'messagesStore' | 'appStore'>, IState> {
@observable @observable
private heights: Record<string, number> = {}; private heights: Record<string, number> = {};
@observable
private deleteAll = false;
private static appId(props: IProps) { private static appId(props: IProps) {
if (props === undefined) { if (props === undefined) {
@ -79,7 +82,7 @@ class Messages extends Component<IProps & Stores<'messagesStore' | 'appStore'>,
variant="contained" variant="contained"
disabled={!hasMessages} disabled={!hasMessages}
color="primary" color="primary"
onClick={() => messagesStore.removeByApp(appId)} onClick={() => {this.deleteAll = true}}
> >
Delete All Delete All
</Button> </Button>
@ -108,6 +111,15 @@ class Messages extends Component<IProps & Stores<'messagesStore' | 'appStore'>,
) : ( ) : (
this.label('No messages') this.label('No messages')
)} )}
{this.deleteAll && (
<ConfirmDialog
title="Confirm Delete"
text={'Delete all messages?'}
fClose={() => (this.deleteAll = false)}
fOnSubmit={() => messagesStore.removeByApp(appId)}
/>
)}
</DefaultPage> </DefaultPage>
); );
} }

7
ui/src/tests/message.test.ts
View File

@ -219,6 +219,8 @@ describe('Messages', () => {
it('deletes all linux messages', async () => { it('deletes all linux messages', async () => {
await navigate('Linux'); await navigate('Linux');
await page.click('#delete-all'); await page.click('#delete-all');
await page.waitForSelector(selector.$confirmDialog.selector());
await page.click(selector.$confirmDialog.button('.confirm'));
await page.waitForSelector('#delete-all:disabled'); await page.waitForSelector('#delete-all:disabled');
await expectMessages({ await expectMessages({
all: [windows3, backup1, windows1], all: [windows3, backup1, windows1],
@ -250,6 +252,9 @@ describe('Messages', () => {
it('deletes all messages', async () => { it('deletes all messages', async () => {
await navigate('All Messages'); await navigate('All Messages');
await page.click('#delete-all'); await page.click('#delete-all');
await page.waitForSelector(selector.$confirmDialog.selector());
await page.click(selector.$confirmDialog.button('.confirm'));
await page.waitForSelector('#delete-all:disabled');
await expectMessages({ await expectMessages({
all: [], all: [],
windows: [], windows: [],
@ -269,6 +274,8 @@ describe('Messages', () => {
it('deletes all backup messages and navigates to all messages', async () => { it('deletes all backup messages and navigates to all messages', async () => {
await navigate('Backup'); await navigate('Backup');
await page.click('#delete-all'); await page.click('#delete-all');
await page.waitForSelector(selector.$confirmDialog.selector());
await page.click(selector.$confirmDialog.button('.confirm'));
await page.waitForSelector('#delete-all:disabled'); await page.waitForSelector('#delete-all:disabled');
await navigate('All Messages'); await navigate('All Messages');
await createMessage(backup3, backupServerToken); await createMessage(backup3, backupServerToken);