Merge branch 'main' into open-source-2

Author: ambika-garg

airflow/api_connexion/schemas/task_instance_schema.py

@@ -65,7 +65,7 @@ class Meta:
     executor = auto_field()
     executor_config = auto_field()
     note = auto_field()
-    rendered_map_index = auto_field()
+    rendered_map_index = fields.String(attribute="rendered_map_index", dump_only=True)
     rendered_fields = JsonObjectField(dump_default={})
     trigger = fields.Nested(TriggerSchema)
     triggerer_job = fields.Nested(JobSchema)

airflow/cli/commands/local_commands/celery_command.py

@@ -2279,7 +2279,7 @@ def dag_display_name(self) -> str:
         :meta private:
         """
         return case(
-            (self._dag_display_property_value.isnot(None), self._dag_display_property_value),
+            (self._dag_display_property_value.is_not(None), self._dag_display_property_value),
             else_=self.dag_id,
         )
 

airflow/models/dag.py

@@ -1675,7 +1675,7 @@ class TaskInstance(Base, LoggingMixin):
     executor = Column(String(1000))
     executor_config = Column(ExecutorConfigType(pickler=dill))
     updated_at = Column(UtcDateTime, default=timezone.utcnow, onupdate=timezone.utcnow)
-    rendered_map_index = Column(String(250))
+    _rendered_map_index = Column("rendered_map_index", String(250))
 
     external_executor_id = Column(StringID())
 
@@ -1846,6 +1846,14 @@ def operator_name(self) -> str | None:
     def task_display_name(self) -> str:
         return self._task_display_property_value or self.task_id
 
+    @hybrid_property
+    def rendered_map_index(self) -> str | None:
+        if self._rendered_map_index is not None:
+            return self._rendered_map_index
+        if self.map_index >= 0:
+            return str(self.map_index)
+        return None
+
     @classmethod
     def from_runtime_ti(cls, runtime_ti: RuntimeTaskInstanceProtocol) -> TaskInstance:
         if runtime_ti.map_index is None:
@@ -2918,10 +2926,10 @@ def _render_map_index(context: Context, *, jinja_env: jinja2.Environment | None)
                 except Exception:
                     # If the task failed, swallow rendering error so it doesn't mask the main error.
                     with contextlib.suppress(jinja2.TemplateSyntaxError, jinja2.UndefinedError):
-                        self.rendered_map_index = _render_map_index(context, jinja_env=jinja_env)
+                        self._rendered_map_index = _render_map_index(context, jinja_env=jinja_env)
                     raise
                 else:  # If the task succeeded, render normally to let rendering error bubble up.
-                    self.rendered_map_index = _render_map_index(context, jinja_env=jinja_env)
+                    self._rendered_map_index = _render_map_index(context, jinja_env=jinja_env)
 
             # Run post_execute callback
             self.task.post_execute(context=context, result=result)

airflow/models/taskinstance.py

@@ -92,7 +92,7 @@ class TaskInstanceHistory(Base):
     next_method = Column(String(1000))
     next_kwargs = Column(MutableDict.as_mutable(ExtendedJSON))
 
-    task_display_name = Column("task_display_name", String(2000), nullable=True)
+    task_display_name = Column(String(2000), nullable=True)
     dag_version_id = Column(UUIDType(binary=False))
 
     dag_version = relationship(

airflow/models/taskinstancehistory.py

@@ -28,7 +28,7 @@ type Props = {
 } & FlexProps;
 
 const RenderedJsonField = ({ content, jsonProps, ...rest }: Props) => {
-  const contentFormatted = JSON.stringify(content, null, 4);
+  const contentFormatted = JSON.stringify(content, undefined, 4);
   const { theme } = useTheme();
 
   return (

airflow/ui/src/components/RenderedJsonField.tsx

@@ -89,6 +89,7 @@ export const SearchDags = ({
         menuIsOpen
         onChange={onSelect}
         placeholder="Search Dags"
+        // eslint-disable-next-line unicorn/no-null
         value={null} // null is required https://github.com/JedWatson/react-select/issues/3066
       />
     </Field.Root>

airflow/ui/src/components/SearchDags/SearchDags.tsx

@@ -138,7 +138,9 @@ export const Code = () => {
               loadOptions={loadVersions}
               onChange={handleStateChange}
               placeholder="Dag Version"
-              value={selectedVersion === null ? null : { label: selectedVersion, value: selectedVersion }} // null is required https://github.com/JedWatson/react-select/issues/3066
+              // null is required https://github.com/JedWatson/react-select/issues/3066
+              // eslint-disable-next-line unicorn/no-null
+              value={selectedVersion === null ? null : { label: selectedVersion, value: selectedVersion }}
             />
           </Field.Root>
 

airflow/ui/src/pages/Dag/Code/Code.tsx

@@ -99,13 +99,17 @@ const columns: Array<ColumnDef<DAGWithLatestDagRunsResponse>> = [
     accessorKey: "last_run_start_date",
     cell: ({ row: { original } }) =>
       original.latest_dag_runs[0] ? (
-        <DagRunInfo
-          endDate={original.latest_dag_runs[0].end_date}
-          logicalDate={original.latest_dag_runs[0].logical_date}
-          runAfter={original.latest_dag_runs[0].run_after}
-          startDate={original.latest_dag_runs[0].start_date}
-          state={original.latest_dag_runs[0].state}
-        />
+        <Link asChild color="fg.info" fontWeight="bold">
+          <RouterLink to={`/dags/${original.dag_id}/runs/${original.latest_dag_runs[0].dag_run_id}`}>
+            <DagRunInfo
+              endDate={original.latest_dag_runs[0].end_date}
+              logicalDate={original.latest_dag_runs[0].logical_date}
+              runAfter={original.latest_dag_runs[0].run_after}
+              startDate={original.latest_dag_runs[0].start_date}
+              state={original.latest_dag_runs[0].state}
+            />
+          </RouterLink>
+        </Link>
       ) : undefined,
     header: "Last Dag Run",
   },

airflow/ui/src/pages/DagsList/DagsList.tsx

@@ -50,7 +50,7 @@ const columns: Array<ColumnDef<ProviderResponse>> = [
   {
     accessorKey: "description",
     cell: ({ row: { original } }) => {
-      const urlRegex = /http(s)?:\/\/[\w.-]+(\.?:[\w.-]+)*([#/?][\w!#$%&'()*+,./:;=?@[\]~-]*)?/gu;
+      const urlRegex = /https?:\/\/[\w.-]+(?:\.?:[\w.-]+)*(?:[#/?][\w!#$%&'()*+,./:;=?@[\]~-]*)?/gu;
       const urls = original.description.match(urlRegex);
       const cleanText = original.description.replaceAll(/\n(?:and)?/gu, " ").split(" ");
 

airflow/ui/src/pages/Providers.tsx

@@ -136,7 +136,11 @@ export const Details = () => {
           <Table.Row>
             <Table.Cell>Duration</Table.Cell>
             <Table.Cell>
-              {getDuration(tryInstance?.start_date ?? null, tryInstance?.end_date ?? null)}s
+              {
+                // eslint-disable-next-line unicorn/no-null
+                getDuration(tryInstance?.start_date ?? null, tryInstance?.end_date ?? null)
+              }
+              s
             </Table.Cell>
           </Table.Row>
           <Table.Row>

airflow/ui/src/pages/TaskInstance/Details.tsx

@@ -462,6 +462,8 @@ see in CI in your local environment.
                 --role Admin \
                 --email [email protected]
 
+.. note::
+    ``airflow users`` command is only available when `FAB auth manager <https://airflow.apache.org/docs/apache-airflow-providers-fab/stable/auth-manager/index.html>`_ is enabled.
 
 7. Exiting the Breeze environment. After successfully finishing above command will leave you in container,
    type ``exit`` to exit the container. The database created before will remain and servers will be