Skip to content
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
5 changes: 0 additions & 5 deletions airflow-core/src/airflow/ui/public/i18n/locales/ar/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -118,11 +118,6 @@
"viewInExternal": "عرض السجلات في {{name}} (المحاولة {{attempt}})",
"warning": "تحذير"
},
"navigation": {
"navigation": "التنقل: {{arrow}}",
"openGraphFilters": "مرشحات المهام: Ctrl+Shift+F",
"toggleGroup": "تبديل المجموعة: المسافة"
},
"notFound": {
"back": "رجوع",
"backToDags": "العودة إلى Dags",
Expand Down
5 changes: 0 additions & 5 deletions airflow-core/src/airflow/ui/public/i18n/locales/ca/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@
"viewInExternal": "Veure els registres a {{name}} (intent {{attempt}})",
"warning": "ADVERTIMENT"
},
"navigation": {
"navigation": "Navegació: Shift+{{arrow}}",
"openGraphFilters": "Filtres de tasques: Ctrl+Maj+F",
"toggleGroup": "Alternar grup: Espai"
},
"notFound": {
"back": "Enrere",
"backToDags": "Tornar als Dags",
Expand Down
5 changes: 0 additions & 5 deletions airflow-core/src/airflow/ui/public/i18n/locales/de/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@
"viewInExternal": "Protokoll in {{name}} (Versuch {{attempt}}) ansehen",
"warning": "WARNING"
},
"navigation": {
"navigation": "Navigation: Umschalttaste+{{arrow}}",
"openGraphFilters": "Task-Filter: Strg+Umschalt+F",
"toggleGroup": "Gruppen umschalten: Leertaste"
},
"notFound": {
"back": "Zurück",
"backToDags": "Zurück zu Dags",
Expand Down
3 changes: 0 additions & 3 deletions airflow-core/src/airflow/ui/public/i18n/locales/en/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@
"viewInExternal": "View logs in {{name}} (attempt {{attempt}})",
"warning": "WARNING"
},
"navigation": {
"openGraphFilters": "Task Filters: Ctrl+Shift+F"
},
"notFound": {
"back": "Go Back",
"backToDags": "Back to Dags",
Expand Down
5 changes: 0 additions & 5 deletions airflow-core/src/airflow/ui/public/i18n/locales/fr/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@
"viewInExternal": "Voir les journaux dans {{name}} (tentative {{attempt}})",
"warning": "AVERTISSEMENT"
},
"navigation": {
"navigation": "Navigation : {{arrow}}",
"openGraphFilters": "Filtres de tâches : Ctrl+Maj+F",
"toggleGroup": "Basculer le groupe : Espace"
},
"notFound": {
"back": "Retour",
"backToDags": "Retour aux Dags",
Expand Down
5 changes: 0 additions & 5 deletions airflow-core/src/airflow/ui/public/i18n/locales/he/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -109,11 +109,6 @@
"viewInExternal": "צפה ברישומים ב-{{name}} (ניסיון {{attempt}})",
"warning": "WARNING"
},
"navigation": {
"navigation": "ניווט: {{arrow}}",
"openGraphFilters": "פילטרים משימות: Ctrl+Shift+F",
"toggleGroup": "החלפת קבוצה: רווח"
},
"notFound": {
"back": "חזור",
"backToDags": "חזור ל-Dags",
Expand Down
5 changes: 0 additions & 5 deletions airflow-core/src/airflow/ui/public/i18n/locales/hi/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@
"viewInExternal": "{{name}} में लॉग्स देखें (प्रयास {{attempt}})",
"warning": "WARNING"
},
"navigation": {
"navigation": "नेवीगेशन: Shift+{{arrow}}",
"openGraphFilters": "Task फ़िल्टर: Ctrl+Shift+F",
"toggleGroup": "ग्रुप टॉगल करें: Space"
},
"notFound": {
"back": "वापस जाएं",
"backToDags": "डैग्स पर वापस जाएं",
Expand Down
5 changes: 0 additions & 5 deletions airflow-core/src/airflow/ui/public/i18n/locales/hu/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@
"viewInExternal": "Naplók megtekintése itt: {{name}} (próbálkozás: {{attempt}})",
"warning": "FIGYELMEZTETÉS"
},
"navigation": {
"navigation": "Navigáció: {{arrow}}",
"openGraphFilters": "Feladat szűrők: Ctrl+Shift+F",
"toggleGroup": "Csoport váltása: Szóköz"
},
"notFound": {
"back": "Vissza",
"backToDags": "Vissza a Dag-ekhez",
Expand Down
3 changes: 0 additions & 3 deletions airflow-core/src/airflow/ui/public/i18n/locales/ko/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,6 @@
"viewInExternal": "{{name}}에서 로그 보기 (시도 {{attempt}})",
"warning": "경고"
},
"navigation": {
"openGraphFilters": "태스크 필터: Ctrl+Shift+F"
},
"notFound": {
"back": "뒤로",
"backToDags": "Dags로 돌아가기",
Expand Down
5 changes: 0 additions & 5 deletions airflow-core/src/airflow/ui/public/i18n/locales/pl/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,6 @@
"viewInExternal": "Zobacz logi w {{name}} (próba {{attempt}})",
"warning": "WARNING"
},
"navigation": {
"navigation": "Przewiń: {{arrow}}",
"openGraphFilters": "Filtry zadań: Ctrl+Shift+F",
"toggleGroup": "Przełącz grupę: Space"
},
"notFound": {
"back": "Wróć",
"backToDags": "Powrót do Dagów",
Expand Down
5 changes: 0 additions & 5 deletions airflow-core/src/airflow/ui/public/i18n/locales/tr/dag.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@
"viewInExternal": "Günlükleri {{name}} içinde görüntüle (deneme {{attempt}})",
"warning": "UYARI"
},
"navigation": {
"navigation": "Gezin: {{arrow}}",
"openGraphFilters": "Görev Filtreleri: Ctrl+Shift+F",
"toggleGroup": "Grubu aç/kapat: Space"
},
"notFound": {
"back": "Geri Dön",
"backToDags": "Dag'lere Geri Dön",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,11 +106,6 @@
"viewInExternal": "在 {{name}} 中查看日志(重试 {{attempt}})",
"warning": "WARNING"
},
"navigation": {
"navigation": "导航: {{arrow}}",
"openGraphFilters": "任务筛选器: Ctrl+Shift+F",
"toggleGroup": "展开/收起分组: 空格键"
},
"notFound": {
"back": "返回",
"backToDags": "返回 Dags",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
import { Box, Button, Flex, HStack, LinkOverlay, Text } from "@chakra-ui/react";
import type { NodeProps, Node as NodeType } from "@xyflow/react";
import { useTranslation } from "react-i18next";
import { AiOutlineGroup } from "react-icons/ai";

import { TaskIcon } from "src/assets/TaskIcon";
import { StateBadge } from "src/components/StateBadge";
Expand Down Expand Up @@ -112,7 +113,7 @@ export const TaskNode = ({
width={`${width + (isSelected ? 4 : 0)}px`}
>
<HStack>
<TaskIcon />
{isGroup ? <AiOutlineGroup /> : <TaskIcon />}
<LinkOverlay asChild>
<TaskLink
childCount={thisChildCount}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -366,7 +366,7 @@ export const generateElkGraph = ({
}

const label = `${node.label}${node.is_mapped ? "[1000]" : ""}${node.children ? ` + ${node.children.length} tasks` : ""}`;
let width = getTextWidth(label, font);
let width = getTextWidth(label, font) + 16; // 16 for icons
const hasStateBar = Boolean(node.is_mapped) || Boolean(node.children);
let height = hasStateBar ? 90 : 80;

Expand Down
2 changes: 0 additions & 2 deletions airflow-core/src/airflow/ui/src/components/TaskName.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ export const TaskName = ({
fontWeight="bold"
overflow="hidden"
textOverflow="ellipsis"
title={label}
whiteSpace="nowrap"
{...rest}
>
Expand All @@ -71,7 +70,6 @@ export const TaskName = ({
fontWeight="bold"
overflow="hidden"
textOverflow="ellipsis"
title={label}
whiteSpace="nowrap"
{...rest}
>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ export const GridFilters = () => {
const { filterConfigs, handleFiltersChange, initialValues } = useFiltersHandler(searchParamKeys);

return (
<FilterBar configs={filterConfigs} initialValues={initialValues} onFiltersChange={handleFiltersChange} />
<FilterBar
configs={filterConfigs}
initialValues={initialValues}
onFiltersChange={handleFiltersChange}
showPresetFilters={false}
/>
);
};
Original file line number Diff line number Diff line change
Expand Up @@ -24,14 +24,13 @@ import {
Portal,
Select,
type SelectValueChangeDetails,
Text,
VStack,
} from "@chakra-ui/react";
import { useReactFlow } from "@xyflow/react";
import { useEffect, useRef } from "react";
import { useTranslation } from "react-i18next";
import { FiGrid } from "react-icons/fi";
import { LuChartGantt, LuKeyboard } from "react-icons/lu";
import { LuChartGantt } from "react-icons/lu";
import { MdOutlineAccountTree, MdSettings } from "react-icons/md";
import type { ImperativePanelGroupHandle } from "react-resizable-panels";
import { useParams } from "react-router-dom";
Expand All @@ -40,7 +39,7 @@ import { useLocalStorage } from "usehooks-ts";
import { DagVersionSelect } from "src/components/DagVersionSelect";
import { DirectionDropdown } from "src/components/Graph/DirectionDropdown";
import { GraphTaskFilters } from "src/components/GraphTaskFilters";
import { IconButton, Tooltip } from "src/components/ui";
import { IconButton } from "src/components/ui";
import { type ButtonGroupOption, ButtonGroupToggle } from "src/components/ui/ButtonGroupToggle";
import type { DagView } from "src/constants/dagView";
import { dependenciesKey } from "src/constants/localStorage";
Expand Down Expand Up @@ -309,15 +308,7 @@ export const PanelButtons = ({
</Flex>
</Flex>

{dagView === "graph" ? (
<Flex justifyContent="flex-end" mt={1}>
<Flex color="fg.muted" gap={2}>
<Tooltip content={<Text>{translate("dag:navigation.openGraphFilters")}</Text>} portalled>
<LuKeyboard />
</Tooltip>
</Flex>
</Flex>
) : (
{dagView !== "graph" && (
<Flex justifyContent="space-between" mt={1}>
<GridFilters />
<Flex color="fg.muted" gap={2} justifyContent="flex-end" mt={1}>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
import { Box } from "@chakra-ui/react";
import type { ReactNode } from "react";
import { useTranslation } from "react-i18next";
import { MdOutlineTask } from "react-icons/md";
import { AiOutlineGroup } from "react-icons/ai";

import type { LightGridTaskInstanceSummary } from "openapi/requests/types.gen";
import { ClearTaskInstanceButton } from "src/components/Clear";
Expand Down Expand Up @@ -61,7 +61,7 @@ export const Header = ({ taskInstance }: { readonly taskInstance: LightGridTaskI
<MarkTaskGroupAsButton groupTaskInstance={taskInstance} isHotkeyEnabled />
</>
}
icon={<MdOutlineTask />}
icon={<AiOutlineGroup />}
state={taskInstance.state}
stats={stats}
subTitle={<Time datetime={taskInstance.min_start_date} />}
Expand Down
Loading