Skip to content

Commit 98aaa5d

Browse files
committed
fix: show only relevant option in overview dropdown
feat: add missing translations
1 parent 62ecfbb commit 98aaa5d

File tree

6 files changed

+45
-17
lines changed

6 files changed

+45
-17
lines changed

packages/ui/src/components/OverviewDropDownActions/OverviewDropDownActions.tsx

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,29 @@
1-
import React from 'react';
1+
import { AppQueue } from '@bull-board/api/dist/typings/app';
22
import { Item, Portal, Root, Trigger } from '@radix-ui/react-dropdown-menu';
3+
import React from 'react';
4+
import { useTranslation } from 'react-i18next';
5+
import { QueueActions } from '../../../typings/app';
36
import { Button } from '../Button/Button';
47
import { DropdownContent } from '../DropdownContent/DropdownContent';
58
import { EllipsisVerticalIcon } from '../Icons/EllipsisVertical';
69
import { PauseIcon } from '../Icons/Pause';
710
import { PlayIcon } from '../Icons/Play';
8-
import { useTranslation } from 'react-i18next';
9-
import { useQueues } from '../../hooks/useQueues';
1011

1112
export const OverviewActions = ({
1213
actions,
14+
queues,
1315
}: {
14-
actions: ReturnType<typeof useQueues>['actions'];
16+
actions: QueueActions;
17+
queues: AppQueue[] | null;
1518
}) => {
1619
const { t } = useTranslation();
1720

21+
if (!queues) {
22+
return null;
23+
}
24+
25+
const areAllPaused = queues.every((queue) => queue.isPaused);
26+
1827
return (
1928
<Root>
2029
<Trigger asChild>
@@ -25,14 +34,17 @@ export const OverviewActions = ({
2534

2635
<Portal>
2736
<DropdownContent align="end">
28-
<Item onClick={actions.pauseAll}>
29-
<PauseIcon />
30-
{t('QUEUE.ACTIONS.PAUSE_ALL')}
31-
</Item>
32-
<Item onClick={actions.resumeAll}>
33-
<PlayIcon />
34-
{t('QUEUE.ACTIONS.RESUME_ALL')}
35-
</Item>
37+
{areAllPaused ? (
38+
<Item onClick={actions.resumeAll}>
39+
<PlayIcon />
40+
{t('QUEUE.ACTIONS.RESUME_ALL')}
41+
</Item>
42+
) : (
43+
<Item onClick={actions.pauseAll}>
44+
<PauseIcon />
45+
{t('QUEUE.ACTIONS.PAUSE_ALL')}
46+
</Item>
47+
)}
3648
</DropdownContent>
3749
</Portal>
3850
</Root>

packages/ui/src/pages/OverviewPage/OverviewPage.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ export const OverviewPage = () => {
2323
<section>
2424
<div className={s.header}>
2525
<StatusLegend />
26-
<OverviewDropDownActions actions={actions} />
26+
<OverviewDropDownActions actions={actions} queues={queues} />
2727
</div>
2828
{queuesToView.length > 0 && (
2929
<ul className={s.overview}>

packages/ui/src/static/locales/es-ES/messages.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
"CLEAN_ALL": "Limpiar todas",
6767
"RESUME": "Reanudar",
6868
"PAUSE": "Pausar",
69+
"RESUME_ALL": "Reanudar todo",
70+
"PAUSE_ALL": "Pausar todo",
6971
"EMPTY": "Vaciar",
7072
"ADD_JOB": "Añadir tarea",
7173
"CONFIRM": {
@@ -74,7 +76,9 @@
7476
"PROMOTE_ALL": "¿Estás seguro de que quieres promover todas las tareas retrasadas?",
7577
"PAUSE_QUEUE": "¿Estás seguro de que quieres pausar el procesamiento de la cola?",
7678
"EMPTY_QUEUE": "¿Estás seguro de que quieres vaciar la cola?",
77-
"RESUME_QUEUE": "¿Estás seguro de que quieres reanudar el procesamiento de la cola?"
79+
"RESUME_QUEUE": "¿Estás seguro de que quieres reanudar el procesamiento de la cola?",
80+
"PAUSE_ALL": "¿Estás seguro de que deseas pausar todas las colas?",
81+
"RESUME_ALL": "¿Estás seguro de que deseas reanudar todas las colas?"
7882
}
7983
},
8084
"STATUS": {

packages/ui/src/static/locales/fr-FR/messages.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
"CLEAN_ALL": "Tout nettoyer",
6767
"RESUME": "Reprendre",
6868
"PAUSE": "Pause",
69+
"RESUME_ALL": "Reprendre tout",
70+
"PAUSE_ALL": "Mettre tout en pause",
6971
"EMPTY": "Vider",
7072
"ADD_JOB": "Ajouter une tâche",
7173
"CONFIRM": {
@@ -74,7 +76,9 @@
7476
"PROMOTE_ALL": "Êtes-vous sûr de vouloir promouvoir toutes les tâches retardées ?",
7577
"PAUSE_QUEUE": "Êtes-vous sûr de vouloir mettre en pause le traitement de la file ?",
7678
"EMPTY_QUEUE": "Êtes-vous sûr de vouloir vider la file ?",
77-
"RESUME_QUEUE": "Êtes-vous sûr de vouloir reprendre le traitement de la file ?"
79+
"RESUME_QUEUE": "Êtes-vous sûr de vouloir reprendre le traitement de la file ?",
80+
"PAUSE_ALL": "Êtes-vous sûr de vouloir mettre toutes les files d'attente en pause ?",
81+
"RESUME_ALL": "Êtes-vous sûr de vouloir reprendre toutes les files d'attente ?"
7882
}
7983
},
8084
"STATUS": {

packages/ui/src/static/locales/pt-BR/messages.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,8 @@
6666
"CLEAN_ALL": "Limpar todos",
6767
"RESUME": "Resumir",
6868
"PAUSE": "Pausar",
69+
"RESUME_ALL": "Retomar tudo",
70+
"PAUSE_ALL": "Pausar tudo",
6971
"EMPTY": "Limpar",
7072
"ADD_JOB": "Adicionar trabalho",
7173
"CONFIRM": {
@@ -74,7 +76,9 @@
7476
"PROMOTE_ALL": "Deseja realmente promover todas as tarefas atrasadas?",
7577
"PAUSE_QUEUE": "Deseja realmente pausar o processamento da fila?",
7678
"EMPTY_QUEUE": "Deseja realmente limpar a fila?",
77-
"RESUME_QUEUE": "Deseja realmente retomar o processamento da fila?"
79+
"RESUME_QUEUE": "Deseja realmente retomar o processamento da fila?",
80+
"PAUSE_ALL": "Tem certeza de que deseja pausar todas as filas?",
81+
"RESUME_ALL": "Tem certeza de que deseja retomar todas as filas?"
7882
}
7983
},
8084
"STATUS": {

packages/ui/src/static/locales/zh-CN/messages.json

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,8 @@
6363
"CLEAN_ALL": "清理全部",
6464
"RESUME": "恢复",
6565
"PAUSE": "暂停",
66+
"RESUME_ALL": "全部恢复",
67+
"PAUSE_ALL": "全部暂停",
6668
"EMPTY": "清空",
6769
"ADD_JOB": "添加作业",
6870
"CONFIRM": {
@@ -71,7 +73,9 @@
7173
"PROMOTE_ALL": "您确定要提升所有延迟作业吗?",
7274
"PAUSE_QUEUE": "您确定要暂停队列处理吗?",
7375
"EMPTY_QUEUE": "您确定要清空队列吗?",
74-
"RESUME_QUEUE": "您确定要恢复队列处理吗?"
76+
"RESUME_QUEUE": "您确定要恢复队列处理吗?",
77+
"PAUSE_ALL": "您确定要暂停所有队列吗?",
78+
"RESUME_ALL": "您确定要恢复所有队列吗?"
7579
}
7680
},
7781
"STATUS": {

0 commit comments

Comments
 (0)