diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index d6c1105d..f5ad37b5 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -20,7 +20,7 @@ jobs:
     name: "Generate CI matrix"
     uses: "glpi-project/plugin-ci-workflows/.github/workflows/generate-ci-matrix.yml@v1"
     with:
-      glpi-version: "11.0.x"
+      glpi-version: "12.0.x"
   ci:
     name: "GLPI ${{ matrix.glpi-version }} - php:${{ matrix.php-version }} - ${{ matrix.db-image }}"
     needs: "generate-ci-matrix"
diff --git a/CHANGELOG.md b/CHANGELOG.md
index c579fcf3..b9ee66f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,10 +7,16 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
 
+### Added
+
+- GLPI 12 compatibility
+
 ### Fixed
 
 - Fix flaky escalation test on solve/reject-solution data sets
 - CI: fix Psalm cache directory, drop the stray `glpi-project/tools` composer dependency, declare a unique composer autoloader suffix
+- Simplify group reassignment to a single actor diff, relying on GLPI core's status preservation on simultaneous actor removal/addition
+
 
 ## [2.10.8] 2026-09-11
 
diff --git a/front/config.form.php b/front/config.form.php
index e65a7bbb..cabd1e72 100644
--- a/front/config.form.php
+++ b/front/config.form.php
@@ -30,9 +30,7 @@
 
 Session::checkLoginUser();
 
-if (! isset($_GET["id"])) {
-    $_GET["id"] = 0;
-}
+$_GET["id"] ??= 0;
 
 if (!Plugin::isPluginActive('escalade')) {
     echo "Plugin not installed or activated";
@@ -42,15 +40,15 @@
 $config = new PluginEscaladeConfig();
 
 if (isset($_POST["add"])) {
-    Session::checkRight("config", CREATE);
+    Session::checkRight(Config::$rightname, CREATE);
     $newID = $config->add($_POST);
     Html::back();
 } elseif (isset($_POST["update"])) {
-    Session::checkRight("config", UPDATE);
+    Session::checkRight(Config::$rightname, UPDATE);
     $config->update($_POST);
     Html::back();
 } elseif (isset($_POST["delete"])) {
-    Session::checkRight("config", DELETE);
+    Session::checkRight(Config::$rightname, DELETE);
     $config->delete($_POST, true);
     Html::redirect("./config.form.php");
 } else {
diff --git a/front/group_group.form.php b/front/group_group.form.php
index 37899cf6..ca06a5c1 100644
--- a/front/group_group.form.php
+++ b/front/group_group.form.php
@@ -34,7 +34,7 @@
 
 Html::header("escalade", $_SERVER["PHP_SELF"], "plugins", "escalade", "group_group");
 
-if (Session::haveRight('group', UPDATE)) {
+if (Session::haveRight(Group::$rightname, UPDATE)) {
     if (isset($_POST['addgroup'])) {
         $group_source = new Group();
         $group_destination = new Group();
diff --git a/hook.php b/hook.php
index 752848fe..6b759f7b 100644
--- a/hook.php
+++ b/hook.php
@@ -329,9 +329,7 @@ function plugin_escalade_install()
             $tickets_id = $data['tickets_id'];
             unset($data['tickets_id']);
 
-            if (!isset($histories[$tickets_id])) {
-                $histories[$tickets_id] = [];
-            }
+            $histories[$tickets_id] ??= [];
 
             $histories[$tickets_id][] = $data;
         }
@@ -525,9 +523,7 @@ function plugin_escalade_pre_item_add_group_ticket($item)
         && $item->input['type'] == CommonITILActor::ASSIGN
         && empty($item->input['_plugin_escalade_rules_only'])
     ) {
-        if (!isset($_SESSION['plugin_escalade']['current_group_assignment'])) {
-            $_SESSION['plugin_escalade']['current_group_assignment'] = [];
-        }
+        $_SESSION['plugin_escalade']['current_group_assignment'] ??= [];
 
         $_SESSION['plugin_escalade']['current_group_assignment'][$item->input['tickets_id']] = [
             'group_id' => $item->input['groups_id'],
diff --git a/inc/config.class.php b/inc/config.class.php
index e0b84cdb..01f7d34d 100644
--- a/inc/config.class.php
+++ b/inc/config.class.php
@@ -32,7 +32,7 @@
 
 class PluginEscaladeConfig extends CommonDBTM
 {
-    public static $rightname  = 'config';
+    public static string $rightname  = 'config';
 
     public static function getMenuName()
     {
diff --git a/inc/group_group.class.php b/inc/group_group.class.php
index 0228c363..709cef31 100644
--- a/inc/group_group.class.php
+++ b/inc/group_group.class.php
@@ -38,13 +38,13 @@
 class PluginEscaladeGroup_Group extends CommonDBRelation
 {
     // From CommonDBRelation
-    public static $itemtype_1   = 'Group';
+    public static ?string $itemtype_1   = 'Group';
 
-    public static $items_id_1   = 'groups_id_source';
+    public static ?string $items_id_1   = 'groups_id_source';
 
-    public static $itemtype_2   = 'Group';
+    public static ?string $itemtype_2   = 'Group';
 
-    public static $items_id_2   = 'groups_id_destination';
+    public static ?string $items_id_2   = 'groups_id_destination';
 
     public function getForbiddenStandardMassiveAction()
     {
@@ -96,7 +96,7 @@ public function manageGroup($groups_id)
         $gg_found = $this->find(['groups_id_source' => $groups_id]);
         $nb = count($gg_found);
 
-        if (Session::haveRight('group', UPDATE)) {
+        if (Session::haveRight(Group::$rightname, UPDATE)) {
             $groups_id_used = [];
             foreach ($gg_found as $gg) {
                 $groups_id_used[] = $gg['groups_id_destination'];
@@ -123,7 +123,7 @@ public function manageGroup($groups_id)
         }
 
         TemplateRenderer::getInstance()->display('@escalade/group_group.html.twig', [
-            'canedit'             => Session::haveRight('group', UPDATE),
+            'canedit'             => Session::haveRight(Group::$rightname, UPDATE),
             'group_id'              => $groups_id,
             'groups'                => $groups,
             'massiveactionparams'   => $massiveactionparams ?? [],
diff --git a/inc/history.class.php b/inc/history.class.php
index 53600d7b..a8c570eb 100644
--- a/inc/history.class.php
+++ b/inc/history.class.php
@@ -41,9 +41,9 @@ public static function getFirstLineForTicket($tickets_id)
         $found = self::getFullHistory($tickets_id);
         if (count($found) === 0) {
             return false;
-        } else {
-            return array_pop($found);
         }
+
+        return array_pop($found);
     }
 
     public static function getlastLineForTicket($tickets_id)
@@ -51,9 +51,9 @@ public static function getlastLineForTicket($tickets_id)
         $found = self::getFullHistory($tickets_id);
         if (count($found) === 0) {
             return false;
-        } else {
-            return array_shift($found);
         }
+
+        return array_shift($found);
     }
 
     public static function getLastHistoryForTicketAndGroup($tickets_id, $groups_id, $previous_groups_id)
@@ -272,7 +272,7 @@ public static function getHistory($tickets_id, $full_history = false)
     public static function showGroupLink($group, $full_history = false)
     {
 
-        if (!$group->can($group->fields['id'], READ)) {
+        if (!Session::haveRight(Group::$rightname, READ)) {
             return '';
         }
 
@@ -287,7 +287,7 @@ public static function showGroupLink($group, $full_history = false)
             echo sprintf(" onclick='self.opener.location.href=\"%s\"; self.close();'", $link);
         }
 
-        echo ">" . $group->getNameID(true) . "</a>";
+        echo ">" . $group->getNameID() . "</a>";
         return null;
     }
 
@@ -304,9 +304,9 @@ public static function showCentralSpecificList($type)
         global $CFG_GLPI, $DB;
 
         if (
-            ! Session::haveRight("ticket", Ticket::READALL)
-            && ! Session::haveRight("ticket", Ticket::READASSIGN)
-            && ! Session::haveRight("ticket", CREATE)
+            ! Session::haveRight(Ticket::$rightname, Ticket::READALL)
+            && ! Session::haveRight(Ticket::$rightname, Ticket::READASSIGN)
+            && ! Session::haveRight(Ticket::$rightname, CREATE)
             && ! Session::haveRight("ticketvalidation", TicketValidation::VALIDATEREQUEST
                                                       & TicketValidation::VALIDATEINCIDENT)
         ) {
diff --git a/inc/notification.class.php b/inc/notification.class.php
index 6eb15768..aff04891 100644
--- a/inc/notification.class.php
+++ b/inc/notification.class.php
@@ -169,34 +169,21 @@ public static function getActionTargets(NotificationTarget $target)
                     case self::NTRGT_TICKET_REQUESTER_GROUP: // phpcs:ignore
                         $group_type = CommonITILActor::REQUESTER;
                         // no break
-                    case self::NTRGT_TICKET_WATCH_GROUP: // phpcs:ignore
-                        if (!isset($group_type)) {
-                            $group_type = CommonITILActor::OBSERVER;
-                        }
+                    case self::NTRGT_TICKET_WATCH_GROUP: $group_type ??= CommonITILActor::OBSERVER;
                         // no break
                     case self::NTRGT_TICKET_TECH_GROUP:
                         $manager = 0;
 
                         // manager of group's users
                         // no break
-                    case self::NTRGT_TICKET_REQUESTER_GROUP_MANAGER: // phpcs:ignore
-                        if (!isset($group_type)) {
-                            $group_type = CommonITILActor::REQUESTER;
-                        }
+                    case self::NTRGT_TICKET_REQUESTER_GROUP_MANAGER: $group_type ??= CommonITILActor::REQUESTER;
                         // no break
-                    case self::NTRGT_TICKET_WATCH_GROUP_MANAGER: // phpcs:ignore
-                        if (!isset($group_type)) {
-                            $group_type = CommonITILActor::OBSERVER;
-                        }
+                    case self::NTRGT_TICKET_WATCH_GROUP_MANAGER: $group_type ??= CommonITILActor::OBSERVER;
                         // no break
                     case self::NTRGT_TICKET_TECH_GROUP_MANAGER:
-                        if (!isset($manager)) {
-                            $manager = 1;
-                        }
+                        $manager ??= 1;
 
-                        if (!isset($group_type)) {
-                            $group_type = CommonITILActor::ASSIGN;
-                        }
+                        $group_type ??= CommonITILActor::ASSIGN;
 
                         self::addGroupsOfTicket($target, $ticket->getID(), $manager, $group_type);
                         break;
@@ -205,15 +192,10 @@ public static function getActionTargets(NotificationTarget $target)
                     case self::NTRGT_TICKET_REQUESTER_USER: // phpcs:ignore
                         $user_type = CommonITILActor::REQUESTER;
                         // no break
-                    case self::NTRGT_TICKET_WATCH_USER: // phpcs:ignore
-                        if (!isset($user_type)) {
-                            $user_type = CommonITILActor::OBSERVER;
-                        }
+                    case self::NTRGT_TICKET_WATCH_USER: $user_type ??= CommonITILActor::OBSERVER;
                         // no break
                     case self::NTRGT_TICKET_TECH_USER:
-                        if (!isset($user_type)) {
-                            $user_type = CommonITILActor::ASSIGN;
-                        }
+                        $user_type ??= CommonITILActor::ASSIGN;
 
                         self::addUsersOfTicket($target, $ticket->getID(), $user_type);
                         break;
@@ -228,9 +210,7 @@ public static function getActionTargets(NotificationTarget $target)
                         $manager = 0;
                         // no break
                     case self::NTRGT_TICKET_ESCALADE_GROUP_MANAGER:
-                        if (!isset($manager)) {
-                            $manager = 1;
-                        }
+                        $manager ??= 1;
 
                         $history = new PluginEscaladeHistory();
                         foreach ($history->find(['tickets_id' => $ticket->getID()]) as $found_history) {
@@ -249,9 +229,7 @@ public static function getActionTargets(NotificationTarget $target)
                     $manager = 0;
                     // no break
                 case self::NTRGT_TICKET_LAST_ESCALADE_GROUP_MANAGER:
-                    if (!isset($manager)) {
-                        $manager = 1;
-                    }
+                    $manager ??= 1;
 
                     $group_to_notify = null;
 
diff --git a/inc/taskmanager.class.php b/inc/taskmanager.class.php
index aba8ce0e..70d7e818 100644
--- a/inc/taskmanager.class.php
+++ b/inc/taskmanager.class.php
@@ -42,7 +42,7 @@ public static function setTicketTask(array $input): void
             return;
         }
 
-        if (!empty(self::$ticket_task->input)) {
+        if (self::$ticket_task->input !== [] && self::$ticket_task->input !== false) {
             return;
         }
 
diff --git a/inc/ticket.class.php b/inc/ticket.class.php
index 31ab26a8..a52b3fe9 100644
--- a/inc/ticket.class.php
+++ b/inc/ticket.class.php
@@ -484,7 +484,7 @@ public static function addHistoryOnAddGroup(CommonDBTM $item)
         $previous_groups_id = 0;
         $counter            = 0;
 
-        if (count($group_ticket->fields) > 0) {
+        if ($group_ticket->fields !== []) {
             $previous_groups_id = $group_ticket->fields['groups_id'];
 
             $last_history_groups = PluginEscaladeHistory::getLastHistoryForTicketAndGroup($tickets_id, $groups_id, $previous_groups_id);
@@ -551,24 +551,6 @@ public static function processAfterAddGroup(Group_Ticket $item)
         if ($_SESSION['glpi_plugins']['escalade']['config']['remove_group'] == true) {
             $all_actors = self::getTicketFieldsWithActors($tickets_id, $groups_id);
 
-            // Keep only the new group in the assign list (drop old ones).
-            $seen_new_group = false;
-            $all_actors['assign'] = array_values(array_filter(
-                $all_actors['assign'],
-                function (array $actor) use ($groups_id, &$seen_new_group): bool {
-                    if ($actor['itemtype'] !== 'Group') {
-                        return true;
-                    }
-
-                    if ($actor['items_id'] == $groups_id && !$seen_new_group) {
-                        $seen_new_group = true;
-                        return true;
-                    }
-
-                    return false;
-                },
-            ));
-
             $ticket_for_rules = new Ticket();
             $ticket_for_rules->getFromDB($tickets_id);
             $ticket_for_rules->update([
@@ -1279,6 +1261,11 @@ public static function getTicketFieldsWithActors($tickets_id, $group_id)
             }
         }
 
+        // Diff-only when remove_group: lets core delete the old group(s) and add the new one in a single call.
+        if ($_SESSION['glpi_plugins']['escalade']['config']['remove_group'] == true) {
+            $ticket_actors['Group']['assign'] = [];
+        }
+
         $ticket_actors['Group']['assign'][] = [
             'itemtype' => 'Group',
             'items_id' => $group_id,
diff --git a/inc/user.class.php b/inc/user.class.php
index b2a5c9fb..e2837eb1 100644
--- a/inc/user.class.php
+++ b/inc/user.class.php
@@ -64,9 +64,9 @@ public static function processMassiveActionsForOneItemtype(MassiveAction $ma, Co
                 if ($escalade_user->getFromDBByCrit(['users_id' => $id])) {
                     $escalade_user->fields['bypass_filter_assign_group'] = $input['bypass_filter_assign_group'];
                     if ($escalade_user->update($escalade_user->fields)) {
-                        $ma->itemDone($item->getType(), $id, MassiveAction::ACTION_OK);
+                        $ma->itemDone($item::class, $id, MassiveAction::ACTION_OK);
                     } else {
-                        $ma->itemDone($item->getType(), $id, MassiveAction::ACTION_KO);
+                        $ma->itemDone($item::class, $id, MassiveAction::ACTION_KO);
                     }
                 }
             }
diff --git a/public/js/central.js.php b/public/js/central.js.php
index fbd5ae0a..58476b66 100644
--- a/public/js/central.js.php
+++ b/public/js/central.js.php
@@ -34,8 +34,8 @@
 //not executed in self-service interface & right verification
 if (
     $_SESSION['glpiactiveprofile']['interface'] == "central"
-    && (Session::haveRight("ticket", CREATE)
-      || Session::haveRight("ticket", UPDATE))
+    && (Session::haveRight(Ticket::$rightname, CREATE)
+      || Session::haveRight(Ticket::$rightname, UPDATE))
 ) {
     $locale_group_view = __s('Group View');
 
diff --git a/public/js/cloneandlink_ticket.js.php b/public/js/cloneandlink_ticket.js.php
index bf397970..79454d26 100644
--- a/public/js/cloneandlink_ticket.js.php
+++ b/public/js/cloneandlink_ticket.js.php
@@ -34,8 +34,8 @@
 //not executed in self-service interface & right verification
 if (
     $_SESSION['glpiactiveprofile']['interface'] == "central"
-    && Session::haveRight("ticket", CREATE)
-    && Session::haveRight("ticket", UPDATE)
+    && Session::haveRight(Ticket::$rightname, CREATE)
+    && Session::haveRight(Ticket::$rightname, UPDATE)
 ) {
     $locale_cloneandlink  = __s("Clone and link", "escalade");
     $locale_clone  = __s("Clone");
diff --git a/public/js/escalade.js.php b/public/js/escalade.js.php
index 29e68e4a..648d779f 100644
--- a/public/js/escalade.js.php
+++ b/public/js/escalade.js.php
@@ -34,8 +34,8 @@
 //not executed in self-service interface & right verification
 if (
     $_SESSION['glpiactiveprofile']['interface'] == "central"
-    && (Session::haveRight("ticket", CREATE)
-        || Session::haveRight("ticket", UPDATE))
+    && (Session::haveRight(Ticket::$rightname, CREATE)
+        || Session::haveRight(Ticket::$rightname, UPDATE))
 ) {
     $locale_actor = __s('Actor');
 
diff --git a/setup.php b/setup.php
index 80313473..6c5523a5 100644
--- a/setup.php
+++ b/setup.php
@@ -32,9 +32,9 @@
 
 define('PLUGIN_ESCALADE_VERSION', '2.10.8');
 // Minimal GLPI version, inclusive
-define("PLUGIN_ESCALADE_MIN_GLPI", "11.0.0");
+define("PLUGIN_ESCALADE_MIN_GLPI", "12.0.0");
 // Maximum GLPI version, exclusive
-define("PLUGIN_ESCALADE_MAX_GLPI", "11.0.99");
+define("PLUGIN_ESCALADE_MAX_GLPI", "12.0.99");
 
 if (!defined("PLUGIN_ESCALADE_DIR")) {
     define("PLUGIN_ESCALADE_DIR", Plugin::getPhpDir("escalade"));
@@ -134,7 +134,7 @@ function plugin_init_escalade()
         }
 
         // == Interface links ==
-        if (Session::haveRight('config', UPDATE)) {
+        if (Session::haveRight(Config::$rightname, UPDATE)) {
             $PLUGIN_HOOKS['config_page']['escalade'] = 'front/config.form.php';
 
             $PLUGIN_HOOKS['menu_toadd']['escalade'] = [
@@ -172,7 +172,7 @@ function plugin_init_escalade()
 function plugin_version_escalade()
 {
     return [
-        'name'           => __s("Escalation", "escalade"),
+        'name'           => "Escalation",
         'version'        => PLUGIN_ESCALADE_VERSION,
         'author'         => "<a href='http://www.teclib.com'>Teclib'</a>",
         'homepage'       => "https://github.com/pluginsGLPI/escalade",
diff --git a/templates/config.html.twig b/templates/config.html.twig
index 52f8b921..d4848d80 100644
--- a/templates/config.html.twig
+++ b/templates/config.html.twig
@@ -34,7 +34,6 @@
 <div class="card">
     <div class="card-body">
         <form name='form' action='{{ action }}' method='post'>
-            <input type="hidden" name="_glpi_csrf_token" value="{{ csrf_token() }}">
             <input type="hidden" name="id" value="{{ id }}">
 
             <div class="hr-text mt-2">
@@ -61,7 +60,6 @@
 
                 {% set display_remove_group_options = not config["remove_group"] ? 'd-none' : '' %}
                 {% set display_tech_group_options = not config["use_assign_user_group"] ? 'd-none' : '' %}
-                {% set display_hidden_field = (not config["remove_group"] and config["use_assign_user_group"]) or (config["remove_group"] and not config["use_assign_user_group"]) ? '' : 'd-none' %}
 
                 <div class="row">
                     <div class="col-1"></div>
@@ -79,47 +77,37 @@
                     <div class="col-1"></div>
                 </div>
 
-                {{ fields.sliderField(
-                    'show_history',
-                    config["show_history"],
-                    __("Show group assign history visually", "escalade"),
-                    field_options|merge({'add_field_class': display_remove_group_options})
-                ) }}
-
-                {{ fields.hiddenField(
-                    'splitfield',
-                    '',
-                    '',
-                    field_options|merge({'add_field_class': display_hidden_field})
-                ) }}
-
-                {{ fields.sliderField(
-                    'use_assign_user_group_creation',
-                    config["use_assign_user_group_creation"],
-                    __('at creation time', 'escalade'),
-                    field_options|merge({'add_field_class': display_tech_group_options})
-                ) }}
-
-                {{ fields.sliderField(
-                    'solve_return_group',
-                    config["solve_return_group"],
-                    __("Assign ticket to initial group on solve ticket", "escalade"),
-                    field_options|merge({'add_field_class': display_remove_group_options})
-                ) }}
-
-                {{ fields.hiddenField(
-                    'splitfield',
-                    '',
-                    '',
-                    field_options|merge({'add_field_class': display_hidden_field})
-                ) }}
+                <div class="col-12 col-sm-6">
+                    {{ fields.sliderField(
+                        'show_history',
+                        config["show_history"],
+                        __("Show group assign history visually", "escalade"),
+                        field_options|merge({'field_class': 'col-12', 'add_field_class': display_remove_group_options})
+                    ) }}
+
+                    {{ fields.sliderField(
+                        'solve_return_group',
+                        config["solve_return_group"],
+                        __("Assign ticket to initial group on solve ticket", "escalade"),
+                        field_options|merge({'field_class': 'col-12', 'add_field_class': display_remove_group_options})
+                    ) }}
+                </div>
 
-                {{ fields.sliderField(
-                    'use_assign_user_group_modification',
-                    config["use_assign_user_group_modification"],
-                    __('at modification time', 'escalade'),
-                    field_options|merge({'add_field_class': display_tech_group_options})
-                ) }}
+                <div class="col-12 col-sm-6">
+                    {{ fields.sliderField(
+                        'use_assign_user_group_creation',
+                        config["use_assign_user_group_creation"],
+                        __('at creation time', 'escalade'),
+                        field_options|merge({'field_class': 'col-12', 'add_field_class': display_tech_group_options})
+                    ) }}
+
+                    {{ fields.sliderField(
+                        'use_assign_user_group_modification',
+                        config["use_assign_user_group_modification"],
+                        __('at modification time', 'escalade'),
+                        field_options|merge({'field_class': 'col-12', 'add_field_class': display_tech_group_options})
+                    ) }}
+                </div>
 
                 <div class="row">
                     <div class="col-1"></div>
@@ -342,10 +330,8 @@
 <script>
     $(document).ready(function() {
         const remove_group_checkbox = document.querySelector('[name="remove_group"][type="checkbox"]');
-        const remove_group_elements = document.querySelectorAll('[for*="show-history"], [for*="solve-return-group"]');
+        const remove_group_elements = document.querySelectorAll('[for*="show_history"], [for*="solve_return_group"]');
         remove_group_checkbox.addEventListener('click', function() {
-            const selectValue = document.querySelector('[name="use_assign_user_group"]').value;
-            hide_show_hidden_fields(selectValue);
             remove_group_elements.forEach(function(element) {
                 const parentDiv = element.closest('.form-field');
                 if (parentDiv.classList.contains('d-none')) {
@@ -365,8 +351,7 @@
         });
     })
     function hide_technician_group(val) {
-        const technician_group_elements = document.querySelectorAll('[for*="use-assign-user-group-modification"], [for*="use-assign-user-group-creation"]');
-        hide_show_hidden_fields(val);
+        const technician_group_elements = document.querySelectorAll('[for*="use_assign_user_group_modification"], [for*="use_assign_user_group_creation"]');
         technician_group_elements.forEach(function(element) {
             const parentDiv = element.closest('.form-field');
             if (parentDiv.classList.contains('d-none')) {
@@ -388,19 +373,4 @@
             }
         });
     }
-    function hide_show_hidden_fields(val) {
-        const remove_group_checkbox = document.querySelector('[name="remove_group"][type="checkbox"]');
-        const hidden_elements = document.querySelectorAll('[for*="splitfield"]');
-        if ((!remove_group_checkbox.checked && val == 0) || (remove_group_checkbox.checked && val != 0)) {
-            hidden_elements.forEach(function(element) {
-                const parentDiv = element.closest('.form-field');
-                parentDiv.classList.add('d-none');
-            });
-        } else {
-            hidden_elements.forEach(function(element) {
-                const parentDiv = element.closest('.form-field');
-                parentDiv.classList.remove('d-none');
-            });
-        }
-    }
 </script>
\ No newline at end of file
diff --git a/templates/escalade_form.html.twig b/templates/escalade_form.html.twig
index b22e62a7..2f88130e 100644
--- a/templates/escalade_form.html.twig
+++ b/templates/escalade_form.html.twig
@@ -37,7 +37,6 @@
               data-track-changes="true" data-submit-once>
 
             <input type="hidden" name="tickets_id" value="{{ ticket.getID() }}" />
-            <input type="hidden" name="_glpi_csrf_token" value="{{ csrf_token() }}" />
 
             <div class="escalation card-header">
                 <h3 class="card-title"> {{ __('Escalate ticket', 'escalade') }}</h3>
diff --git a/templates/group_group.html.twig b/templates/group_group.html.twig
index 9768cb34..2d3db6f4 100644
--- a/templates/group_group.html.twig
+++ b/templates/group_group.html.twig
@@ -41,7 +41,6 @@
             }
         ) }}
         <input type="hidden" name="groups_id_source" value="{{ group_id }}">
-        <input type="hidden" name="_glpi_csrf_token" value="{{ csrf_token() }}">
         <div class="hstack gap-1">
             <div class="pe-5 ms-auto">
                 <button class="btn btn-primary" type="submit" name="addgroup" value="1">
diff --git a/templates/user.html.twig b/templates/user.html.twig
index 3029b951..bf1d274f 100644
--- a/templates/user.html.twig
+++ b/templates/user.html.twig
@@ -29,7 +29,6 @@
 {% import "components/form/fields_macros.html.twig" as fields %}
 
 <form method="post" action="{{ formurl }}">
-    <input type="hidden" name="_glpi_csrf_token" value="{{ csrf_token() }}">
     {{ fields.dropdownYesNo(
         'use_filter_assign_group',
         this['use_filter_assign_group'],
diff --git a/tests/EscaladeTestCase.php b/tests/EscaladeTestCase.php
index 77d1af92..560ab5e0 100644
--- a/tests/EscaladeTestCase.php
+++ b/tests/EscaladeTestCase.php
@@ -89,14 +89,9 @@ public function initConfig(array $conf = [])
     {
         $this->login();
 
-        // Initialize session structure FIRST to avoid warnings
-        if (!isset($_SESSION['glpi_plugins'])) {
-            $_SESSION['glpi_plugins'] = [];
-        }
+        $_SESSION['glpi_plugins'] ??= [];
 
-        if (!isset($_SESSION['glpi_plugins']['escalade'])) {
-            $_SESSION['glpi_plugins']['escalade'] = [];
-        }
+        $_SESSION['glpi_plugins']['escalade'] ??= [];
 
         // Load default config into session to avoid warnings during ticket operations
         $_SESSION['glpi_plugins']['escalade']['config'] = [
@@ -237,7 +232,7 @@ public function escalateWithSolvedTicket(Ticket $ticket, Group $group, array $so
         $solution = new ITILSolution();
         $solution_id = $solution->add(array_merge([
             'content' => 'Test Solution',
-            'itemtype' => $ticket->getType(),
+            'itemtype' => $ticket::class,
             'items_id' => $ticket->getID(),
             'users_id' => Session::getLoginUserID(),
         ], $solution_options));
diff --git a/tests/Units/ActorDiffReplacementTest.php b/tests/Units/ActorDiffReplacementTest.php
new file mode 100644
index 00000000..ccc149d0
--- /dev/null
+++ b/tests/Units/ActorDiffReplacementTest.php
@@ -0,0 +1,134 @@
+<?php
+
+/**
+ * -------------------------------------------------------------------------
+ * Escalade plugin for GLPI
+ * -------------------------------------------------------------------------
+ *
+ * LICENSE
+ *
+ * This file is part of Escalade.
+ *
+ * Escalade is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Escalade is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Escalade. If not, see <http://www.gnu.org/licenses/>.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2015-2023 by Escalade plugin team.
+ * @license   GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link      https://github.com/pluginsGLPI/escalade
+ * -------------------------------------------------------------------------
+ */
+
+namespace GlpiPlugin\Escalade\Tests\Units;
+
+use CommonITILActor;
+use Glpi\DBAL\QueryExpression;
+use GlpiPlugin\Escalade\Tests\EscaladeTestCase;
+use Group_Ticket;
+use Notification;
+use NotificationTarget;
+use QueuedNotification;
+use Ticket;
+use User;
+
+// Kept isolated from GroupEscalationTest.php, which has a pre-existing state-leak flakiness.
+final class ActorDiffReplacementTest extends EscaladeTestCase
+{
+    public function testSingleShotGroupReplacementPreservesStatusAndNotifiesOnlyNewGroup(): void
+    {
+        global $CFG_GLPI, $DB;
+
+        $this->initConfig([
+            'remove_group' => 1,
+            'show_history' => 1,
+        ]);
+
+        $CFG_GLPI['use_notifications'] = true;
+        $CFG_GLPI['notifications_mailing'] = true;
+
+        $DB->update(Notification::getTable(), ['is_active' => false], [new QueryExpression('true')]);
+
+        $notification = new Notification();
+        if (!$notification->getFromDBByCrit(['itemtype' => 'Ticket', 'event' => 'assign_group'])) {
+            $this->markTestSkipped('assign_group notification not found');
+        }
+
+        $this->assertTrue($notification->update(['id' => $notification->getID(), 'is_active' => 1]));
+
+        $DB->delete(NotificationTarget::getTable(), ['notifications_id' => $notification->getID()]);
+        $this->createItem(NotificationTarget::class, [
+            'notifications_id' => $notification->getID(),
+            'items_id'         => Notification::ASSIGN_GROUP,
+            'type'             => Notification::USER_TYPE,
+        ]);
+
+        [$user1, $user2] = $this->createItems(User::class, [
+            ['name' => 'diff_user1_' . uniqid(), '_useremails' => [-1 => 'diff1_' . uniqid() . '@example.com']],
+            ['name' => 'diff_user2_' . uniqid(), '_useremails' => [-1 => 'diff2_' . uniqid() . '@example.com']],
+        ]);
+
+        $group1 = $this->createGroupAndAssignUsers($user1, 'diff_group_1_' . uniqid());
+        $group2 = $this->createGroupAndAssignUsers($user2, 'diff_group_2_' . uniqid());
+
+        $ticket = $this->createItem(Ticket::class, [
+            'name'        => 'Diff replacement test',
+            'content'     => 'content',
+            'entities_id' => $this->getTestRootEntity(true),
+            '_actors'     => [
+                'assign' => [
+                    ['items_id' => $group1->getID(), 'itemtype' => 'Group'],
+                ],
+            ],
+        ]);
+        $this->assertEquals(Ticket::ASSIGNED, $ticket->fields['status']);
+
+        $this->cleanQueuedNotifications();
+
+        // Diff-only: only group2 is sent, core must delete group1 and add group2 in one call.
+        $this->updateItem(
+            Ticket::class,
+            $ticket->getID(),
+            [
+                '_actors' => [
+                    'assign' => [
+                        ['items_id' => $group2->getID(), 'itemtype' => 'Group'],
+                    ],
+                ],
+            ],
+        );
+
+        $group_ticket = new Group_Ticket();
+        $this->assertFalse($group_ticket->getFromDBByCrit([
+            'tickets_id' => $ticket->getID(),
+            'groups_id'  => $group1->getID(),
+            'type'       => CommonITILActor::ASSIGN,
+        ]), 'The old group must have been removed');
+        $this->assertTrue($group_ticket->getFromDBByCrit([
+            'tickets_id' => $ticket->getID(),
+            'groups_id'  => $group2->getID(),
+            'type'       => CommonITILActor::ASSIGN,
+        ]), 'The new group must have been added');
+
+        $ticket->getFromDB($ticket->getID());
+        $this->assertEquals(
+            Ticket::ASSIGNED,
+            $ticket->fields['status'],
+            'Status must be preserved despite the old group being removed in the same call as the new group addition',
+        );
+
+        $queued = new QueuedNotification();
+        $recipients = array_column($queued->find(), 'recipient');
+
+        $this->assertContains($this->getItemEmail($user2), $recipients, "The new group's users must be notified");
+        $this->assertNotContains($this->getItemEmail($user1), $recipients, "The old group's users must not be notified");
+    }
+}
diff --git a/tests/Units/GroupEscalationTest.php b/tests/Units/GroupEscalationTest.php
index a838d9c6..ac1f5a91 100644
--- a/tests/Units/GroupEscalationTest.php
+++ b/tests/Units/GroupEscalationTest.php
@@ -949,10 +949,7 @@ public function testHistory()
         $this->assertEquals(1, count($history->find(['tickets_id' => $ticket->getID(), 'groups_id' => $group1->getID()])));
     }
 
-    /**
-     * Test that the standard target "Group in charge of the ticket"
-     * sends notifications to users of both groups (old and new) during an escalation
-     */
+    // The "Group in charge of the ticket" target only notifies the newly assigned group on escalation.
     public function testStandardGroupNotification()
     {
         global $CFG_GLPI, $DB;
@@ -1046,11 +1043,10 @@ public function testStandardGroupNotification()
             $notification_recipients[] = $notif['recipient'];
         }
 
-        // Check that users from both groups received notifications
+        // Only the new group's users should be notified; the old group was removed.
         $group1_user_emails = [$this->getItemEmail($user1), $this->getItemEmail($user2)];
         $group2_user_emails = [$this->getItemEmail($user3), $this->getItemEmail($user4)];
 
-        // At least one user from each group should have received a notification
         $group1_notified = false;
         $group2_notified = false;
 
@@ -1068,7 +1064,7 @@ public function testStandardGroupNotification()
             }
         }
 
-        $this->assertTrue($group1_notified, "No user from the original group received a notification");
+        $this->assertFalse($group1_notified, "A user from the removed group should not receive a notification");
         $this->assertTrue($group2_notified, "No user from the new group received a notification");
     }
 
diff --git a/tests/Units/TicketTest.php b/tests/Units/TicketTest.php
index 6170a1c7..5531912e 100644
--- a/tests/Units/TicketTest.php
+++ b/tests/Units/TicketTest.php
@@ -40,6 +40,7 @@
 use Group_Ticket;
 use Group_User;
 use ITILCategory;
+use PHPUnit\Framework\Attributes\AllowMockObjectsWithoutExpectations;
 use PluginEscaladeTicket;
 use Rule;
 use RuleCommonITILObject;
@@ -52,6 +53,7 @@
 
 final class TicketTest extends EscaladeTestCase
 {
+    #[AllowMockObjectsWithoutExpectations]
     public function testEscalationWithMandatoryFields()
     {
         $this->initConfig();
@@ -480,6 +482,61 @@ public function testStatusTicketOption()
         $this->assertEquals(CommonITILObject::ASSIGNED, $ticket->fields['status']);
     }
 
+    // Pins core's status preservation on simultaneous actor removal/addition for MANAGED_BY_CORE.
+    public function testStatusPreservedOnGroupReassignmentWhenManagedByCore()
+    {
+        $this->initConfig([
+            'remove_group' => 1,
+            'ticket_last_status' => PluginEscaladeTicket::MANAGED_BY_CORE,
+        ]);
+
+        $group1 = $this->createItem('Group', [
+            'name' => 'Group reassign 1_' . uniqid(),
+            'entities_id' => 0,
+            'is_recursive' => 1,
+        ]);
+        $group2 = $this->createItem('Group', [
+            'name' => 'Group reassign 2_' . uniqid(),
+            'entities_id' => 0,
+            'is_recursive' => 1,
+        ]);
+
+        $ticket = $this->createItem('Ticket', [
+            'name' => 'Test ticket for status preservation',
+            'content' => 'Content',
+            'entities_id' => 0,
+            '_actors' => [
+                'assign' => [
+                    [
+                        'items_id' => $group1->getID(),
+                        'itemtype' => 'Group',
+                    ],
+                ],
+            ],
+        ]);
+        $ticket_id = $ticket->getID();
+        $ticket->getFromDB($ticket_id);
+        $this->assertEquals(CommonITILObject::ASSIGNED, $ticket->fields['status']);
+
+        $this->updateItem(Ticket::class, $ticket_id, [
+            '_actors' => [
+                'assign' => [
+                    [
+                        'items_id' => $group2->getID(),
+                        'itemtype' => 'Group',
+                    ],
+                ],
+            ],
+        ]);
+
+        $group_ticket = new Group_Ticket();
+        $this->assertEquals(0, count($group_ticket->find(['tickets_id' => $ticket_id, 'groups_id' => $group1->getID(), 'type' => CommonITILActor::ASSIGN])));
+        $this->assertEquals(1, count($group_ticket->find(['tickets_id' => $ticket_id, 'groups_id' => $group2->getID(), 'type' => CommonITILActor::ASSIGN])));
+
+        $ticket->getFromDB($ticket_id);
+        $this->assertEquals(CommonITILObject::ASSIGNED, $ticket->fields['status']);
+    }
+
     private function testAssignGroupToTicketWithCategoryProvider()
     {
         yield [
@@ -1545,6 +1602,7 @@ public function testSimultaneousGroupAndTechAssignmentDoesNotLoop()
      * which was the cause of the reentrancy loop, while still happening strictly before the
      * new actor is added (delete-before-add notification ordering).
      */
+    #[AllowMockObjectsWithoutExpectations]
     public function testOldAssignRemovalIsDeferredUntilNewActorIsAdded()
     {
         $this->initConfig([
diff --git a/tests/e2e/fixtures/escalade_fixture.ts b/tests/e2e/fixtures/escalade_fixture.ts
new file mode 100644
index 00000000..d9f33bac
--- /dev/null
+++ b/tests/e2e/fixtures/escalade_fixture.ts
@@ -0,0 +1,29 @@
+/**
+ * -------------------------------------------------------------------------
+ * Escalade plugin for GLPI
+ * -------------------------------------------------------------------------
+ *
+ * LICENSE
+ *
+ * This file is part of Escalade.
+ *
+ * Escalade is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Escalade is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Escalade. If not, see <http://www.gnu.org/licenses/>.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2015-2023 by Escalade plugin team.
+ * @license   GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link      https://github.com/pluginsGLPI/escalade
+ * -------------------------------------------------------------------------
+ */
+
+export * from '../../../../../tests/e2e/fixtures/glpi_fixture';
\ No newline at end of file
diff --git a/tests/e2e/package.json b/tests/e2e/package.json
new file mode 100644
index 00000000..60bc0d58
--- /dev/null
+++ b/tests/e2e/package.json
@@ -0,0 +1,4 @@
+{
+    "private": true,
+    "type": "commonjs"
+}
\ No newline at end of file
diff --git a/tests/e2e/specs/config.spec.ts b/tests/e2e/specs/config.spec.ts
new file mode 100644
index 00000000..5c05bf28
--- /dev/null
+++ b/tests/e2e/specs/config.spec.ts
@@ -0,0 +1,142 @@
+/**
+ * -------------------------------------------------------------------------
+ * Escalade plugin for GLPI
+ * -------------------------------------------------------------------------
+ *
+ * LICENSE
+ *
+ * This file is part of Escalade.
+ *
+ * Escalade is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Escalade is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Escalade. If not, see <http://www.gnu.org/licenses/>.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2015-2023 by Escalade plugin team.
+ * @license   GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link      https://github.com/pluginsGLPI/escalade
+ * -------------------------------------------------------------------------
+ */
+
+import { test, expect } from '../fixtures/escalade_fixture';
+import { Profiles } from '../../../../../tests/e2e/utils/Profiles';
+
+test('Displays the Escalade configuration form', async ({ page, profile }) => {
+    await profile.set(Profiles.SuperAdmin);
+
+    const response_superadmin = await page.goto('/plugins/escalade/front/config.form.php');
+    expect(response_superadmin?.status()).toBe(200);
+
+    await expect(page.getByRole('navigation', { name: 'Breadcrumbs' }).getByRole('link', { name: 'Escalade' })).toBeVisible();
+
+    await profile.set(Profiles.SelfService);
+
+    const response_selfservice = await page.goto('/plugins/escalade/front/config.form.php');
+    expect(response_selfservice?.status()).toBe(403);
+});
+
+test('Displays all Escalade configuration fields', async ({ page, profile }) => {
+    await profile.set(Profiles.SuperAdmin);
+    await page.goto('/plugins/escalade/front/config.form.php');
+
+    const checkbox_fields = [
+        'Remove old assign group on new group assign',
+        'Show group assign history visually',
+        'Assign ticket to initial group on solve ticket',
+        'Assign the technical group on ticket category change',
+        'Enable filtering on the groups assignment',
+        'Remove technician(s) on escalation',
+        'Assign the technical manager on ticket category change',
+        'Remove requester(s) on escalation',
+        'Assign me as observer by default',
+        'Escalation history in tasks',
+        'Escalation task is private ?',
+        'Clone tickets',
+        'Close cloned tickets at the same time',
+    ];
+    for (const label of checkbox_fields) {
+        await expect(page.getByRole('checkbox', { name: label })).toBeVisible();
+    }
+
+    const dropdown_labels = [
+        "Use the technician's group",
+        'Ticket status after an escalation',
+    ];
+    for (const label of dropdown_labels) {
+        await expect(page.getByText(label)).toBeVisible();
+    }
+
+    await expect(page.getByRole('checkbox', { name: 'at creation time' })).toBeHidden();
+    await expect(page.getByRole('checkbox', { name: 'at modification time' })).toBeHidden();
+
+    const delete_button_fields = [
+        'remove_delete_requester_user_btn',
+        'remove_delete_watcher_user_btn',
+        'remove_delete_assign_user_btn',
+        'remove_delete_requester_group_btn',
+        'remove_delete_watcher_group_btn',
+        'remove_delete_assign_group_btn',
+        'remove_delete_assign_supplier_btn',
+    ];
+    for (const name of delete_button_fields) {
+        await expect(page.locator(`input[type="checkbox"][name="${name}"]`)).toBeVisible();
+    }
+
+    await expect(page.getByRole('button', { name: 'Save' })).toBeVisible();
+});
+
+test('Toggles technician group fields based on "Use the technician\'s group" value', async ({ page, profile }) => {
+    await profile.set(Profiles.SuperAdmin);
+    await page.goto('/plugins/escalade/front/config.form.php');
+
+    const dropdown = page.getByTestId('form-field-use_assign_user_group').getByRole('combobox');
+    const creation_checkbox = page.getByRole('checkbox', { name: 'at creation time' });
+    const modification_checkbox = page.getByRole('checkbox', { name: 'at modification time' });
+
+    await expect(creation_checkbox).toBeHidden();
+    await expect(modification_checkbox).toBeHidden();
+
+    for (const value of ['First', 'Last']) {
+        await dropdown.click();
+        await page.getByRole('listbox').getByRole('option', { name: value, exact: true }).click();
+
+        await expect(creation_checkbox).toBeVisible();
+        await expect(modification_checkbox).toBeVisible();
+    }
+
+    await dropdown.click();
+    await page.getByRole('listbox').getByRole('option', { name: 'No', exact: true }).click();
+
+    await expect(creation_checkbox).toBeHidden();
+    await expect(modification_checkbox).toBeHidden();
+});
+
+test('Toggles group fields based on "Remove old assign group on new group assign" value', async ({ page, profile }) => {
+    await profile.set(Profiles.SuperAdmin);
+    await page.goto('/plugins/escalade/front/config.form.php');
+
+    const remove_group_checkbox = page.getByRole('checkbox', { name: 'Remove old assign group on new group assign' });
+    const show_history_checkbox = page.getByRole('checkbox', { name: 'Show group assign history visually' });
+    const solve_return_group_checkbox = page.getByRole('checkbox', { name: 'Assign ticket to initial group on solve ticket' });
+
+    // Default value (checked): the group fields are visible.
+    await expect(remove_group_checkbox).toBeChecked();
+    await expect(show_history_checkbox).toBeVisible();
+    await expect(solve_return_group_checkbox).toBeVisible();
+
+    await remove_group_checkbox.click();
+    await expect(show_history_checkbox).toBeHidden();
+    await expect(solve_return_group_checkbox).toBeHidden();
+
+    await remove_group_checkbox.click();
+    await expect(show_history_checkbox).toBeVisible();
+    await expect(solve_return_group_checkbox).toBeVisible();
+});
diff --git a/tests/e2e/specs/timeline.spec.ts b/tests/e2e/specs/timeline.spec.ts
new file mode 100644
index 00000000..d356c4ac
--- /dev/null
+++ b/tests/e2e/specs/timeline.spec.ts
@@ -0,0 +1,79 @@
+/**
+ * -------------------------------------------------------------------------
+ * Escalade plugin for GLPI
+ * -------------------------------------------------------------------------
+ *
+ * LICENSE
+ *
+ * This file is part of Escalade.
+ *
+ * Escalade is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * Escalade is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with Escalade. If not, see <http://www.gnu.org/licenses/>.
+ * -------------------------------------------------------------------------
+ * @copyright Copyright (C) 2015-2023 by Escalade plugin team.
+ * @license   GPLv2 https://www.gnu.org/licenses/gpl-2.0.html
+ * @link      https://github.com/pluginsGLPI/escalade
+ * -------------------------------------------------------------------------
+ */
+
+import { test, expect } from '../fixtures/escalade_fixture';
+import { Profiles } from '../../../../../tests/e2e/utils/Profiles';
+import { getWorkerEntityId } from '../../../../../tests/e2e/utils/WorkerEntities';
+import { TicketPage } from '../../../../../tests/e2e/pages/TicketPage';
+
+test('Can escalate a ticket using the timeline "Escalate" button', async ({ page, profile, api }) => {
+    await profile.set(Profiles.SuperAdmin);
+
+    const group_name = `Escalade group ${crypto.randomUUID()}`;
+    const group_id = await api.createItem('Group', {
+        name: group_name,
+        entities_id: getWorkerEntityId(),
+        is_assign: 1,
+    });
+
+    const ticket_id = await api.createItem('Ticket', {
+        name: `Escalade ticket ${crypto.randomUUID()}`,
+        content: 'Content',
+        entities_id: getWorkerEntityId(),
+    });
+
+    const ticket = new TicketPage(page);
+    await ticket.goto(ticket_id);
+
+    const escalate_action = page.getByRole('link', { name: 'Escalate', exact: true });
+    await page.getByRole('button', { name: 'View other actions' }).click();
+    await escalate_action.click();
+
+    const escalation_panel = page.getByTestId('new-action-escalation-block');
+    await expect(escalation_panel).toBeVisible();
+
+    await ticket.initRichTextByLabel('Comment', escalation_panel);
+    const comment_field = ticket.getRichTextByLabel('Comment', escalation_panel);
+    await comment_field.fill('Escalating this ticket');
+
+    await comment_field.press(' ');
+    await comment_field.press('Backspace');
+
+    const group_dropdown = escalation_panel.getByLabel('Group').locator('+ span').getByRole('combobox');
+    await ticket.doSetDropdownValue(group_dropdown, group_name);
+
+    await escalation_panel.getByRole('button', { name: 'Add', exact: true }).click();
+
+    await expect(async () => {
+        const assigned_groups = await api.getSubItems('Ticket', ticket_id, 'Group_Ticket');
+        const is_escalated = assigned_groups.some(
+            (group: { groups_id: number, type: number }) => group.groups_id === group_id && group.type === 2 /* CommonITILActor::ASSIGN */
+        );
+        expect(is_escalated).toBe(true);
+    }).toPass();
+});
diff --git a/tsconfig.json b/tsconfig.json
new file mode 100644
index 00000000..8749c374
--- /dev/null
+++ b/tsconfig.json
@@ -0,0 +1,14 @@
+{
+    "compilerOptions": {
+        "target": "esnext",
+        "module": "esnext",
+        "moduleResolution": "bundler",
+        "importHelpers": true,
+        "isolatedModules": true,
+        "noEmit": true,
+        "allowUmdGlobalAccess": true,
+        "esModuleInterop": true,
+        "types": ["node"]
+    },
+    "include": ["tests/e2e/**/*.ts"]
+}
\ No newline at end of file