Merge branch 'master' into backend/notifications/44797__email_notifications_not_sent_group_user

Author: EBirkenfeld

backend/src/processes/enums.py

@@ -677,3 +677,15 @@ class SearchContentType:
         (EVENT, EVENT),
         (TASK_TEMPLATE, TASK_TEMPLATE),
     )
+
+
+class SystemVariable:
+
+    DATE = 'date'
+    TEMPLATE_NAME = 'template-name'
+    WORKFLOW_ID = 'workflow-id'
+    WORKFLOW_STARTER = 'workflow-starter'
+
+    WORKFLOW_NAME_VARS = {DATE, TEMPLATE_NAME, WORKFLOW_ID, WORKFLOW_STARTER}
+
+    TASK_VARS = {WORKFLOW_STARTER}

backend/src/processes/locale/de/LC_MESSAGES/django.po

@@ -618,6 +618,10 @@ msgstr "Sie können keinen Kommentar zu einer inaktiven Aufgabe schreiben."
 msgid "The user or group specified for a \"User\" field does not exist."
 msgstr "Der Benutzer oder die Gruppe, die für ein Feld des Typs \"Benutzer\" angegeben wurde, existiert nicht."
 
+#: src/processes/messages/workflow.py:182
+msgid "Guest"
+msgstr "Gast"
+
 #: src/processes/messages/template.py:281
 msgid "Permission denied. You do not have access to this template."
 msgstr "Zugriff verweigert. Sie haben keinen Zugriff auf diese Vorlage."

backend/src/processes/locale/es/LC_MESSAGES/django.po

@@ -618,6 +618,10 @@ msgstr "No puedes escribir un comentario en una tarea inactiva."
 msgid "The user or group specified for a \"User\" field does not exist."
 msgstr "El usuario o grupo especificado para un campo de tipo \"Usuario\" no existe."
 
+#: src/processes/messages/workflow.py:182
+msgid "Guest"
+msgstr "Invitado"
+
 #: src/processes/messages/template.py:281
 msgid "Permission denied. You do not have access to this template."
 msgstr "Permiso denegado. No tienes acceso a esta plantilla."

backend/src/processes/locale/fr/LC_MESSAGES/django.po

@@ -617,6 +617,10 @@ msgstr "Vous ne pouvez pas écrire un commentaire sur une tâche inactive."
 msgid "The user or group specified for a \"User\" field does not exist."
 msgstr "L'utilisateur ou le groupe spécifié pour un champ de type \"Utilisateur\" n'existe pas."
 
+#: src/processes/messages/workflow.py:182
+msgid "Guest"
+msgstr "Invité"
+
 #: src/processes/messages/template.py:281
 msgid "Permission denied. You do not have access to this template."
 msgstr "Accès refusé. Vous n’avez pas accès à ce modèle."

backend/src/processes/locale/ru/LC_MESSAGES/django.po

@@ -620,6 +620,10 @@ msgstr "Нельзя написать комментарий к неактивн
 msgid "The user or group specified for a \"User\" field does not exist."
 msgstr "Указанный пользователь или группа для поля типа \"Пользователь\" не существует."
 
+#: src/processes/messages/workflow.py:182
+msgid "Guest"
+msgstr "Гость"
+
 #: src/processes/messages/template.py:281
 msgid "Permission denied. You do not have access to this template."
 msgstr "Доступ запрещён. У вас нет доступа к этому шаблону."

backend/src/processes/messages/workflow.py

@@ -179,3 +179,4 @@
 MSG_PW_0090 = _(
     'The user or group specified for a "User" field does not exist.',
 )
+MSG_PW_0091 = _('Guest')

backend/src/processes/serializers/templates/task.py

@@ -19,6 +19,7 @@
 from src.processes.enums import (
     PerformerType,
     PredicateType,
+    SystemVariable,
 )
 from src.processes.messages import template as messages
 from src.processes.models.templates.fields import FieldTemplate
@@ -160,11 +161,14 @@ def additional_validate_name(
         **kwargs,
     ):
 
-        """ Checks three cases:
-            1. If api-name is in task name, this field is available
-            (created in previous steps).
-            2. If only api-names is in task name, at least one field
-            must be required. """
+        """ Validates variables {{ ... }} in task name.
+            1. Each variable must reference an existing field
+               from previous steps, OR be a known system variable.
+            2. If the name consists ONLY of variables,
+               at least one field must be required
+               (so the name won't be empty at runtime).
+               System variables always have a value,
+               so this check is skipped when they're present. """
 
         api_names_in_name = {
             api_name.strip()
@@ -173,6 +177,9 @@ def additional_validate_name(
         if not api_names_in_name:
             return
 
+        sys_vars_is_used = bool(api_names_in_name & SystemVariable.TASK_VARS)
+        api_names_in_name -= SystemVariable.TASK_VARS
+
         available_fields = self._get_task_available_fields()
         available_api_names = {field.api_name for field in available_fields}
         failed_api_names = api_names_in_name - available_api_names
@@ -183,7 +190,7 @@ def additional_validate_name(
             )
 
         contains_only_api_names = VAR_PATTERN.sub('', value).strip() == ''
-        if contains_only_api_names:
+        if contains_only_api_names and not sys_vars_is_used:
             not_required_fields = True
             for field in available_fields:
                 if field.api_name in api_names_in_name and field.is_required:
@@ -201,8 +208,9 @@ def additional_validate_description(
         data: Dict[str, Any],
     ):
 
-        """ Checks that api-name in text should be available
-             (created in previous steps) """
+        """ Validates variables {{ ... }} in task description.
+            Each variable must reference an existing field
+            from previous steps, OR be a known system variable. """
 
         if not value:
             return None
@@ -214,6 +222,8 @@ def additional_validate_description(
         if not api_names_in_description:
             return True
 
+        api_names_in_description -= SystemVariable.TASK_VARS
+
         available_api_names_for_description = {
             field.api_name for field in self._get_task_available_fields()
         }

backend/src/processes/serializers/templates/template.py

@@ -34,6 +34,7 @@
     OwnerRole,
     OwnerType,
     PerformerType,
+    SystemVariable,
     TemplateOrdering,
     TemplateType,
     WorkflowApiStatus, TaskStatus,
@@ -302,7 +303,7 @@ def additional_validate_wf_name_template(self, value: str, data: dict):
         if not api_names_in_name:
             return
 
-        sys_vars = {'template-name', 'date', 'workflow-id'}
+        sys_vars = SystemVariable.WORKFLOW_NAME_VARS
         sys_vars_is_used = bool(api_names_in_name & sys_vars)
         api_names_in_name -= sys_vars
         available_fields = self._get_raw_fields_from_kickoff(data)

backend/src/processes/services/workflow_action.py

@@ -7,6 +7,7 @@
 from django.db.models import Q
 from django.utils import timezone
 
+from src.processes.utils.common import get_workflow_starter_name
 from src.analysis.services import AnalyticService
 from src.authentication.enums import AuthTokenType
 from src.authentication.services.guest_auth import GuestJWTAuthService
@@ -322,6 +323,11 @@ def skip_task(
                 TaskStatus.COMPLETED, TaskStatus.SKIPPED,
             )},
         )
+
+        fields_values['workflow-starter'] = get_workflow_starter_name(
+            self.workflow.workflow_starter,
+        )
+
         task_service.insert_fields_values(fields_values=fields_values)
 
         WorkflowEventService.task_skip_event(task)
@@ -403,6 +409,10 @@ def start_workflow(self):
         for task in tasks:
             task_service = TaskService(instance=task, user=self.user)
             fields_values = self.workflow.get_kickoff_fields_markdown_values()
+            fields_values['workflow-starter'] = get_workflow_starter_name(
+                self.workflow.workflow_starter,
+            )
+
             task_service.insert_fields_values(fields_values=fields_values)
 
         WorkflowEventService.workflow_run_event(
@@ -634,6 +644,11 @@ def start_task(
                 TaskStatus.COMPLETED, TaskStatus.SKIPPED,
             )},
         )
+
+        fields_values['workflow-starter'] = get_workflow_starter_name(
+            self.workflow.workflow_starter,
+        )
+
         task_service.insert_fields_values(fields_values=fields_values)
         task.update_performers(restore_performers=True)
         task_performers_exists = (

backend/src/processes/services/workflows/workflow.py

@@ -10,6 +10,7 @@
 from src.analysis.services import AnalyticService
 from src.authentication.enums import AuthTokenType
 from src.processes.consts import WORKFLOW_NAME_LENGTH
+from src.processes.utils.common import get_workflow_starter_name
 from src.processes.models.templates.template import Template
 from src.processes.models.workflows.workflow import Workflow
 from src.processes.serializers.workflows.kickoff_value import (
@@ -70,6 +71,10 @@ def _create_workflow_name(
         if workflow_starter:
             values.update(workflow_starter.get_dynamic_mapping())
 
+        values['workflow-starter'] = get_workflow_starter_name(
+            workflow_starter,
+        )
+
         if user_provided_name:
             result = insert_fields_values_to_text(
                 text=user_provided_name,