Move Dag, run and TI into common.json (apache#51622)

* Move Dag, run and TI into common.json

* Update more translation refs

* Consolidate a few more fields, fix german keys

* Extra consolidation plus refactor keys for all other languages

* Fix config

Author: bbovenzi

airflow-core/src/airflow/ui/public/i18n/locales/en/common.json

@@ -53,7 +53,10 @@
     "queuedAt": "Queued At",
     "runAfter": "Run After",
     "runType": "Run Type",
+<<<<<<< HEAD
     "sourceAssetEvent": "Source Asset Event",
+=======
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
     "triggeredBy": "Triggered By"
   },
   "dagRun_one": "Dag Run",
@@ -177,7 +180,10 @@
     "to": "To"
   },
   "task": {
+<<<<<<< HEAD
     "documentation": "Task Documentation",
+=======
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
     "lastInstance": "Last Instance",
     "operator": "Operator",
     "triggerRule": "Trigger Rule"
@@ -198,6 +204,7 @@
     "queue": "Queue",
     "queuedWhen": "Queued At",
     "scheduledWhen": "Scheduled At",
+<<<<<<< HEAD
     "triggerer": {
       "assigned": "Assigned triggerer",
       "class": "Trigger class",
@@ -206,6 +213,8 @@
       "latestHeartbeat": "Latest triggerer heartbeat",
       "title": "Triggerer Info"
     },
+=======
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
     "unixname": "Unix Name"
   },
   "taskInstance_one": "Task Instance",

airflow-core/src/airflow/ui/public/i18n/locales/en/components.json

@@ -105,12 +105,15 @@
     "selectDescription": "Trigger a single run of this Dag",
     "selectLabel": "Single Run",
     "title": "Trigger Dag",
+<<<<<<< HEAD
     "toaster": {
       "success": {
         "description": "Dag run has been successfully triggered.",
         "title": "Dag Run Triggered"
       }
     },
+=======
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
     "unpause": "Unpause {{dagDisplayName}} on trigger"
   },
   "trimText": {

airflow-core/src/airflow/ui/public/i18n/locales/en/dag.json

@@ -10,7 +10,10 @@
     "noCode": "No Code Found",
     "parsedAt": "Parsed at:"
   },
+<<<<<<< HEAD
   "extraLinks": "Extra Links",
+=======
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
   "grid": {
     "buttons": {
       "resetToLatest": "Reset to latest",
@@ -99,9 +102,13 @@
     "overview": "Overview",
     "renderedTemplates": "Rendered Templates",
     "runs": "Runs",
+<<<<<<< HEAD
     "taskInstances": "Task Instances",
     "tasks": "Tasks",
     "xcom": "XCom"
+=======
+    "tasks": "Tasks"
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
   },
   "taskGroups": {
     "collapseAll": "Collapse all task groups",

airflow-core/src/airflow/ui/public/i18n/locales/en/dags.json

@@ -24,7 +24,10 @@
     "clear": {
       "button": "Clear {{type}}",
       "buttonTooltip": "Press shift+c to clear",
+<<<<<<< HEAD
       "error": "Failed to clear {{type}}",
+=======
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
       "title": "Clear {{type}}"
     },
     "delete": {

airflow-core/src/airflow/ui/public/i18n/locales/zh-TW/common.json

@@ -22,6 +22,7 @@
   "dag_one": "Dag",
   "dag_other": "Dags",
   "dagDetails": {
+<<<<<<< HEAD
     "catchup": "自動回填",
     "concurrency": "並行數",
     "dagRunTimeout": "Dag 執行超時",
@@ -40,11 +41,16 @@
     "nextRun": "下次 Dag 執行",
     "owner": "擁有者",
     "params": "參數",
+=======
+    "latestRun": "上次 Dag 執行",
+    "nextRun": "下次 Dag 執行",
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
     "schedule": "排程",
     "tags": "標籤"
   },
   "dagId": "Dag ID",
   "dagRun": {
+<<<<<<< HEAD
     "conf": "設定",
     "dagVersions": "Dag 版本",
     "dataIntervalEnd": "資料區間結束",
@@ -55,6 +61,11 @@
     "runType": "執行類型",
     "sourceAssetEvent": "來源資源事件",
     "triggeredBy": "觸發者"
+=======
+    "dagVersions": "Dag 版本",
+    "runAfter": "最早可執行時間",
+    "runType": "執行類型"
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
   },
   "dagRun_one": "Dag 執行",
   "dagRun_other": "Dag 執行",
@@ -106,11 +117,16 @@
   },
   "noItemsFound": "找不到 {{modelName}}",
   "note": {
+<<<<<<< HEAD
     "add": "新增筆記",
     "dagRun": "Dag 執行筆記",
     "label": "筆記",
     "placeholder": "新增筆記...",
     "taskInstance": "任務實例筆記"
+=======
+    "label": "備註",
+    "placeholder": "新增備註..."
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
   },
   "pools": {
     "deferred": "已延後",
@@ -177,8 +193,11 @@
     "to": "到"
   },
   "task": {
+<<<<<<< HEAD
     "documentation": "任務文件",
     "lastInstance": "最後實例",
+=======
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
     "operator": "運算子",
     "triggerRule": "觸發規則"
   },
@@ -187,6 +206,7 @@
   "taskId": "任務 ID",
   "taskInstance": {
     "dagVersion": "Dag 版本",
+<<<<<<< HEAD
     "executor": "執行器",
     "executorConfig": "執行器設定",
     "hostname": "主機名稱",
@@ -207,6 +227,9 @@
       "title": "觸發器資訊"
     },
     "unixname": "Unix 名稱"
+=======
+    "pool": "資源池"
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
   },
   "taskInstance_one": "任務實例",
   "taskInstance_other": "任務實例",

airflow-core/src/airflow/ui/public/i18n/locales/zh-TW/components.json

@@ -1,4 +1,5 @@
 {
+<<<<<<< HEAD
   "backfill": {
     "affected_one": "將會觸發 1 次執行。",
     "affected_other": "將會觸發 {{count}} 次執行。",
@@ -128,5 +129,10 @@
   "versionSelect": {
     "dagVersion": "Dag 版本",
     "versionCode": "v{{versionCode}}"
+=======
+  "triggerDag": {
+    "button": "觸發",
+    "title": "觸發 Dag"
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
   }
 }

airflow-core/src/airflow/ui/public/i18n/locales/zh-TW/dags.json

@@ -24,8 +24,12 @@
     "clear": {
       "button": "清除 {{type}}",
       "buttonTooltip": "按下 shift+c 清除",
+<<<<<<< HEAD
       "error": "清除 {{type}} 時發生錯誤",
       "title": "清除 {{type}}"
+=======
+      "title": "清除{{type}}"
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
     },
     "delete": {
       "button": "刪除 {{type}}",
@@ -46,13 +50,21 @@
         "failed": "按下 shift+f 標記為失敗",
         "success": "按下 shift+s 標記為成功"
       },
+<<<<<<< HEAD
       "title": "標記為 {{type}} 為 {{state}}"
+=======
+      "title": "標記為{{type}}為{{state}}"
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
     },
     "options": {
       "downstream": "下游",
       "existingTasks": "清除現有任務",
       "future": "未來",
+<<<<<<< HEAD
       "onlyFailed": "只清除失敗任務",
+=======
+      "onlyFailed": "清除失敗任務",
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
       "past": "過去",
       "queueNew": "排隊新任務",
       "upstream": "上游"
@@ -62,7 +74,10 @@
     "advanced": "進階搜尋",
     "clear": "清除搜尋",
     "dags": "搜尋 Dags",
+<<<<<<< HEAD
     "hotkey": "+K",
+=======
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
     "tasks": "搜尋任務"
   },
   "sort": {

airflow-core/src/airflow/ui/src/components/Clear/Run/ClearRunDialog.tsx

@@ -68,10 +68,14 @@ const ClearRunDialog = ({ dagRun, onClose, open }: Props) => {
         <Dialog.Header>
           <VStack align="start" gap={4}>
             <Heading size="xl">
+<<<<<<< HEAD
               <strong>
                 {translate("dags:runAndTaskActions.clear.title", { type: translate("dagRun_one") })}:{" "}
               </strong>{" "}
               {dagRunId}
+=======
+              <strong>{translate("dags:runAndTaskActions.clear.title", { type: "Run" })}: </strong> {dagRunId}
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
             </Heading>
           </VStack>
         </Dialog.Header>

airflow-core/src/airflow/ui/src/components/DurationChart.tsx

@@ -193,10 +193,17 @@ export const DurationChart = ({
               ticks: {
                 maxTicksLimit: 3,
               },
+<<<<<<< HEAD
               title: { align: "end", display: true, text: translate("common:dagRun.runAfter") },
             },
             y: {
               title: { align: "end", display: true, text: translate("common:duration") },
+=======
+              title: { align: "end", display: true, text: translate("dagRun.runAfter") },
+            },
+            y: {
+              title: { align: "end", display: true, text: translate("duration") },
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
             },
           },
         }}

airflow-core/src/airflow/ui/src/components/MarkAs/Run/MarkRunAsDialog.tsx

@@ -47,11 +47,16 @@ const MarkRunAsDialog = ({ dagRun, onClose, open, state }: Props) => {
         <Dialog.Header>
           <VStack align="start" gap={4}>
             <Heading size="xl">
+<<<<<<< HEAD
               {translate("dags:runAndTaskActions.markAs.title", {
                 state,
                 type: translate("dagRun_one"),
               })}
               : {dagRunId} <StateBadge state={state} />
+=======
+              {translate("dags:runAndTaskActions.markAs.title", { state, type: "Run" })}: {dagRunId}{" "}
+              <StateBadge state={state} />
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
             </Heading>
           </VStack>
         </Dialog.Header>

airflow-core/src/airflow/ui/src/components/MarkAs/TaskInstance/MarkTaskInstanceAsDialog.tsx

@@ -90,11 +90,15 @@ const MarkTaskInstanceAsDialog = ({ onClose, open, state, taskInstance }: Props)
           <VStack align="start" gap={4}>
             <Heading size="xl">
               <strong>
+<<<<<<< HEAD
                 {translate("dags:runAndTaskActions.markAs.title", {
                   state,
                   type: translate("taskInstance_one"),
                 })}
                 :
+=======
+                {translate("dags:runAndTaskActions.markAs.title", { state, type: "Task Instance" })}:
+>>>>>>> bf7a5c94b0 (Move Dag, run and TI into common.json (#51622))
               </strong>{" "}
               {taskInstance.task_display_name} <Time datetime={taskInstance.start_date} />{" "}
               <StateBadge state={state} />

airflow-core/src/airflow/ui/src/pages/DagsList/DagOwners.tsx

@@ -39,6 +39,7 @@ export const DagOwners = ({
     return hasOwnerLink ? (
       <Link
         aria-label={translate("ownerLink", { owner })}
+        asChild
         color="fg.info"
         href={link}
         key={owner}