fix(KAN-14): preserve template inheritance and project data

2026-10-15 11:38:17 +02:00
parent 5769d84526
commit 1291a0fcad
61 changed files with 2696 additions and 335 deletions
@@ -71,7 +71,9 @@ class ResolveProjectTemplateState
        $inheritedAreaValues = array_flip(array_column($inheritedAreas, 'value'));

        return [
-            'effectiveConfiguration' => array_replace($templateConfiguration, array_intersect_key($currentConfiguration, $overriddenAreaValues)),
+            'effectiveConfiguration' => $currentConfiguration,
+            'localConfiguration' => array_diff_key($currentConfiguration, $templateConfiguration),
+            'localAreas' => collect(array_diff(array_keys($currentConfiguration), array_keys($templateConfiguration)))->map(fn (string $area): array => ['label' => $this->labelForArea($area), 'value' => $area])->values()->all(),
            'inheritedAreas' => $inheritedAreas,
            'inheritedConfiguration' => array_intersect_key($templateConfiguration, $inheritedAreaValues),
            'inheritsFromTemplate' => $projectTemplate->is_published,
@@ -96,24 +98,20 @@ class ResolveProjectTemplateState
            return [];
        }

-        $templateStatuses = $templateConfiguration[DuplicateProjectConfiguration::COPY_TICKET_STATUSES] ?? [];
+        $templateStatuses = $templateConfiguration[DuplicateProjectConfiguration::COPY_TICKET_STATUSES] ?? null;
        if (! is_array($templateStatuses)) {
            return [];
        }

-        $statuses = $project->ticketStatuses()->withCount('tickets')->get()->values();
-        $replacementOptions = $statuses->take(count($templateStatuses))->map(
-            static fn ($status): array => ['id' => $status->id, 'name' => $status->name],
+        $statuses = $project->ticketStatuses()->withCount('tickets')->get();
+        $templateKeys = array_column($templateStatuses, 'configuration_key');
+        $replacementOptions = collect($templateStatuses)->map(
+            static fn (array $status): array => ['id' => $status['configuration_key'], 'name' => $status['name']],
        )->all();
-        $removedStatuses = $statuses->slice(count($templateStatuses))
-            ->filter(static fn ($status): bool => $status->tickets_count > 0)
-            ->map(static fn ($status): array => [
-                'id' => $status->id,
-                'name' => $status->name,
-                'ticketCount' => $status->tickets_count,
-            ])
-            ->values()
-            ->all();
+        $removedStatuses = $statuses
+            ->filter(static fn ($status): bool => ! in_array($status->configuration_key, $templateKeys, true) && $status->tickets_count > 0)
+            ->map(static fn ($status): array => ['id' => $status->id, 'name' => $status->name, 'ticketCount' => $status->tickets_count])
+            ->values()->all();

        return $removedStatuses === [] ? [] : [
            DuplicateProjectConfiguration::COPY_TICKET_STATUSES => [