From 25f5cda05192c7c937a763648fe2985264f76b9a Mon Sep 17 00:00:00 2001 From: Marc 'risson' Schmitt Date: Tue, 16 Jun 2026 13:59:04 +0200 Subject: [PATCH] update Signed-off-by: Marc 'risson' Schmitt --- ..._alter_task_aggregated_status_and_more.py} | 21 ++++++++++++++++++- authentik/tasks/models.py | 1 + .../src/models/LastTaskStatusEnum.ts | 1 + .../src/models/TaskAggregatedStatusEnum.ts | 1 + .../client-ts/src/models/TaskStatusEnum.ts | 1 + schema.yml | 2 ++ web/src/elements/tasks/TaskStatus.ts | 3 +++ 7 files changed, 29 insertions(+), 1 deletion(-) rename authentik/tasks/migrations/{0007_task_dependencies_alter_task_state.py => 0007_task_dependencies_alter_task_aggregated_status_and_more.py} (60%) diff --git a/authentik/tasks/migrations/0007_task_dependencies_alter_task_state.py b/authentik/tasks/migrations/0007_task_dependencies_alter_task_aggregated_status_and_more.py similarity index 60% rename from authentik/tasks/migrations/0007_task_dependencies_alter_task_state.py rename to authentik/tasks/migrations/0007_task_dependencies_alter_task_aggregated_status_and_more.py index fd85d660f3..53f21c4d54 100644 --- a/authentik/tasks/migrations/0007_task_dependencies_alter_task_state.py +++ b/authentik/tasks/migrations/0007_task_dependencies_alter_task_aggregated_status_and_more.py @@ -1,4 +1,4 @@ -# Generated by Django 5.2.15 on 2026-06-15 15:51 +# Generated by Django 5.2.15 on 2026-06-16 11:54 from django.db import migrations, models @@ -19,6 +19,25 @@ class Migration(migrations.Migration): verbose_name="Tasks that must complete for this task to run.", ), ), + migrations.AlterField( + model_name="task", + name="aggregated_status", + field=models.TextField( + choices=[ + ("waiting_for_dependencies", "Waiting For Dependencies"), + ("queued", "Queued"), + ("consumed", "Consumed"), + ("preprocess", "Preprocess"), + ("running", "Running"), + ("postprocess", "Postprocess"), + ("rejected", "Rejected"), + ("done", "Done"), + ("info", "Info"), + ("warning", "Warning"), + ("error", "Error"), + ] + ), + ), migrations.AlterField( model_name="task", name="state", diff --git a/authentik/tasks/models.py b/authentik/tasks/models.py index e9ad15826b..3284a15d34 100644 --- a/authentik/tasks/models.py +++ b/authentik/tasks/models.py @@ -20,6 +20,7 @@ from authentik.tenants.models import Tenant class TaskStatus(models.TextChoices): """Task aggregated status. Reported by the task runners""" + WAITING_FOR_DEPENDENCIES = TaskState.WAITING_FOR_DEPENDENCIES QUEUED = TaskState.QUEUED CONSUMED = TaskState.CONSUMED PREPROCESS = TaskState.PREPROCESS diff --git a/packages/client-ts/src/models/LastTaskStatusEnum.ts b/packages/client-ts/src/models/LastTaskStatusEnum.ts index 5f546a5c7b..f521e2595d 100644 --- a/packages/client-ts/src/models/LastTaskStatusEnum.ts +++ b/packages/client-ts/src/models/LastTaskStatusEnum.ts @@ -17,6 +17,7 @@ * @export */ export const LastTaskStatusEnum = { + WaitingForDependencies: "waiting_for_dependencies", Queued: "queued", Consumed: "consumed", Preprocess: "preprocess", diff --git a/packages/client-ts/src/models/TaskAggregatedStatusEnum.ts b/packages/client-ts/src/models/TaskAggregatedStatusEnum.ts index 8105d8e162..7fa8a4b0a4 100644 --- a/packages/client-ts/src/models/TaskAggregatedStatusEnum.ts +++ b/packages/client-ts/src/models/TaskAggregatedStatusEnum.ts @@ -17,6 +17,7 @@ * @export */ export const TaskAggregatedStatusEnum = { + WaitingForDependencies: "waiting_for_dependencies", Queued: "queued", Consumed: "consumed", Preprocess: "preprocess", diff --git a/packages/client-ts/src/models/TaskStatusEnum.ts b/packages/client-ts/src/models/TaskStatusEnum.ts index cf0b8cc403..8ee1f1b100 100644 --- a/packages/client-ts/src/models/TaskStatusEnum.ts +++ b/packages/client-ts/src/models/TaskStatusEnum.ts @@ -17,6 +17,7 @@ * @export */ export const TaskStatusEnum = { + WaitingForDependencies: "waiting_for_dependencies", Queued: "queued", Consumed: "consumed", Preprocess: "preprocess", diff --git a/schema.yml b/schema.yml index 23d7a4b964..2a6834cfe9 100644 --- a/schema.yml +++ b/schema.yml @@ -42645,6 +42645,7 @@ components: - zh-hant LastTaskStatusEnum: enum: + - waiting_for_dependencies - queued - consumed - preprocess @@ -56745,6 +56746,7 @@ components: - uid TaskAggregatedStatusEnum: enum: + - waiting_for_dependencies - queued - consumed - preprocess diff --git a/web/src/elements/tasks/TaskStatus.ts b/web/src/elements/tasks/TaskStatus.ts index cd46c04073..84f6eda3f8 100644 --- a/web/src/elements/tasks/TaskStatus.ts +++ b/web/src/elements/tasks/TaskStatus.ts @@ -20,6 +20,9 @@ export class TaskStatus extends AKElement { render(): TemplateResult { switch (this.status) { + case TaskAggregatedStatusEnum.WaitingForDependencies: + case LastTaskStatusEnum.WaitingForDependencies: + return html`${msg("Waiting for dependencies")}`; case TaskAggregatedStatusEnum.Queued: case LastTaskStatusEnum.Queued: return html`${msg("Waiting to run")}`;