Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add "empty queue" action #493

Merged
merged 1 commit into from
Dec 3, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/api/src/handlers/emptyQueue.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import { BullBoardRequest, ControllerHandlerReturnType } from '../../typings/app';
import { queueProvider } from '../providers/queue';
import { BaseAdapter } from '../queueAdapters/base';

async function emptyQueue(
_req: BullBoardRequest,
queue: BaseAdapter
): Promise<ControllerHandlerReturnType> {
await queue.empty();

return { status: 200, body: {} };
}

export const emptyQueueHandler = queueProvider(emptyQueue);
2 changes: 2 additions & 0 deletions packages/api/src/queueAdapters/base.ts
Original file line number Diff line number Diff line change
Expand Up @@ -61,4 +61,6 @@ export abstract class BaseAdapter {
public abstract pause(): Promise<void>;

public abstract resume(): Promise<void>;

public abstract empty(): Promise<void>;
}
6 changes: 6 additions & 0 deletions packages/api/src/queueAdapters/bull.ts
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,10 @@ export class BullAdapter extends BaseAdapter {
public resume(): Promise<void> {
return this.queue.resume();
}

public empty(): Promise<void> {
return this.queue.empty();
}
}


4 changes: 4 additions & 0 deletions packages/api/src/queueAdapters/bullMQ.ts
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,8 @@ export class BullMQAdapter extends BaseAdapter {
public resume(): Promise<void> {
return this.queue.resume();
}

public empty(): Promise<void> {
return this.queue.drain();
}
}
6 changes: 6 additions & 0 deletions packages/api/src/routes.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import { AppRouteDefs } from '../typings/app';
import { cleanAllHandler } from './handlers/cleanAll';
import { cleanJobHandler } from './handlers/cleanJob';
import { emptyQueueHandler } from './handlers/emptyQueue';
import { entryPoint } from './handlers/entryPoint';
import { jobLogsHandler } from './handlers/jobLogs';
import { pauseQueueHandler } from './handlers/pauseQueue';
Expand Down Expand Up @@ -45,6 +46,11 @@ export const appRoutes: AppRouteDefs = {
route: '/api/queues/:queueName/resume',
handler: resumeQueueHandler,
},
{
method: 'put',
route: '/api/queues/:queueName/empty',
handler: emptyQueueHandler,
},
{
method: 'put',
route: '/api/queues/:queueName/:jobId/retry',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import { Store } from '../../hooks/useStore';
import { EllipsisVerticalIcon } from '../Icons/EllipsisVertical';
import { PauseIcon } from '../Icons/Pause';
import { PlayIcon } from '../Icons/Play';
import { TrashIcon } from '../Icons/Trash'
import { Button } from '../JobCard/Button/Button';
import s from './QueueDropdownActions.module.css';

Expand Down Expand Up @@ -42,6 +43,15 @@ export const QueueDropdownActions = ({
</>
)}
</Item>
<Item
className={s.item}
onSelect={
actions.emptyQueue(queue.name)
}
>
<TrashIcon />
Empty
</Item>
</Content>
</Portal>
</Root>
Expand Down
8 changes: 8 additions & 0 deletions packages/ui/src/hooks/useStore.ts
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,13 @@ export const useStore = (): Store => {
confirmQueueActions
);

const emptyQueue = (queueName: string) =>
withConfirmAndUpdate(
() => api.emptyQueue(queueName),
'Are you sure that you want to empty the queue?',
confirmQueueActions
);

const getJobLogs = (queueName: string) => (job: AppJob) => () =>
api.getJobLogs(queueName, job.id);

Expand All @@ -160,6 +167,7 @@ export const useStore = (): Store => {
getJobLogs,
pauseQueue,
resumeQueue,
emptyQueue,
},
confirmProps,
selectedStatuses,
Expand Down
4 changes: 4 additions & 0 deletions packages/ui/src/services/Api.ts
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ export class Api {
return this.axios.put(`/queues/${encodeURIComponent(queueName)}/resume`);
}

public emptyQueue(queueName: string) {
return this.axios.put(`/queues/${encodeURIComponent(queueName)}/empty`);
}

private handleResponse(response: AxiosResponse): any {
return response.data;
}
Expand Down
1 change: 1 addition & 0 deletions packages/ui/typings/app.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -15,4 +15,5 @@ export interface QueueActions {
cleanAllCompleted: (queueName: string) => () => Promise<void>;
pauseQueue: (queueName: string) => () => Promise<void>;
resumeQueue: (queueName: string) => () => Promise<void>;
emptyQueue: (queueName: string) => () => Promise<void>;
}