From 11cf428a97f5a59c8661f2d7ba93f346a70dd2dd Mon Sep 17 00:00:00 2001 From: Felix Mosheev <9304194+felixmosh@users.noreply.github.com> Date: Sun, 19 Jan 2025 12:58:18 +0200 Subject: [PATCH] fix: apply settings default tab on failed status as well. feat: add default option as default tab selection --- packages/ui/src/components/SettingsModal/SettingsModal.tsx | 2 +- packages/ui/src/hooks/useDetailsTabs.tsx | 6 +----- packages/ui/src/static/locales/en-US/messages.json | 1 + packages/ui/src/static/locales/es-ES/messages.json | 1 + packages/ui/src/static/locales/fr-FR/messages.json | 1 + packages/ui/src/static/locales/pt-BR/messages.json | 1 + packages/ui/src/static/locales/zh-CN/messages.json | 1 + 7 files changed, 7 insertions(+), 6 deletions(-) diff --git a/packages/ui/src/components/SettingsModal/SettingsModal.tsx b/packages/ui/src/components/SettingsModal/SettingsModal.tsx index 85cafd3bf..1451d473c 100644 --- a/packages/ui/src/components/SettingsModal/SettingsModal.tsx +++ b/packages/ui/src/components/SettingsModal/SettingsModal.tsx @@ -68,7 +68,7 @@ export const SettingsModal = ({ open, onClose }: SettingsModalProps) => { ({ + options={['default'].concat(availableJobTabs).map((tab) => ({ text: t(`JOB.TABS.${tab.toUpperCase()}`), value: tab, }))} diff --git a/packages/ui/src/hooks/useDetailsTabs.tsx b/packages/ui/src/hooks/useDetailsTabs.tsx index 8c7a48aab..a4d350858 100644 --- a/packages/ui/src/hooks/useDetailsTabs.tsx +++ b/packages/ui/src/hooks/useDetailsTabs.tsx @@ -27,11 +27,7 @@ export function useDetailsTabs(currentStatus: Status) { }, [currentStatus]); useEffect(() => { - if (!tabs.includes(defaultJobTab) || currentStatus === STATUSES.failed) { - setSelectedTab(tabs[0]); - } else { - setSelectedTab(defaultJobTab); - } + setSelectedTab(tabs.includes(defaultJobTab) ? defaultJobTab : tabs[0]); }, [defaultJobTab, tabs]); return { diff --git a/packages/ui/src/static/locales/en-US/messages.json b/packages/ui/src/static/locales/en-US/messages.json index d3caa4a71..420f052b1 100644 --- a/packages/ui/src/static/locales/en-US/messages.json +++ b/packages/ui/src/static/locales/en-US/messages.json @@ -48,6 +48,7 @@ } }, "TABS": { + "DEFAULT": "Default", "DATA": "Data", "OPTIONS": "Options", "LOGS": "Logs", diff --git a/packages/ui/src/static/locales/es-ES/messages.json b/packages/ui/src/static/locales/es-ES/messages.json index 0b162bbd6..47942df6a 100644 --- a/packages/ui/src/static/locales/es-ES/messages.json +++ b/packages/ui/src/static/locales/es-ES/messages.json @@ -50,6 +50,7 @@ } }, "TABS": { + "DEFAULT": "Predeterminado", "DATA": "Datos", "OPTIONS": "Opciones", "LOGS": "Registros", diff --git a/packages/ui/src/static/locales/fr-FR/messages.json b/packages/ui/src/static/locales/fr-FR/messages.json index 4f14095fd..94046199d 100644 --- a/packages/ui/src/static/locales/fr-FR/messages.json +++ b/packages/ui/src/static/locales/fr-FR/messages.json @@ -50,6 +50,7 @@ } }, "TABS": { + "DEFAULT": "Par défaut", "DATA": "Données", "OPTIONS": "Options", "LOGS": "Journaux", diff --git a/packages/ui/src/static/locales/pt-BR/messages.json b/packages/ui/src/static/locales/pt-BR/messages.json index 48d7070de..acd39d8e0 100644 --- a/packages/ui/src/static/locales/pt-BR/messages.json +++ b/packages/ui/src/static/locales/pt-BR/messages.json @@ -50,6 +50,7 @@ } }, "TABS": { + "DEFAULT": "Padrão", "DATA": "Dados", "OPTIONS": "Opções", "LOGS": "Logs", diff --git a/packages/ui/src/static/locales/zh-CN/messages.json b/packages/ui/src/static/locales/zh-CN/messages.json index 9b1f5ebd5..9d28cea46 100644 --- a/packages/ui/src/static/locales/zh-CN/messages.json +++ b/packages/ui/src/static/locales/zh-CN/messages.json @@ -47,6 +47,7 @@ } }, "TABS": { + "DEFAULT": "默认", "DATA": "数据", "OPTIONS": "选项", "LOGS": "日志",