Merge pull request #3360 from Leantime/fix/move-ticket-kpi-backlog-tiptap-lists

fix: moveTicket, KPI linking, backlog filter on Postgres, tiptap list rendering

Author: marcelfolaron

app/Domain/Canvas/Repositories/Canvas.php

@@ -546,7 +546,6 @@ public function getAllAvailableKPIs($projectId): false|array
         $parentProject = $this->connection->table('zp_projects')
             ->select('parent')
             ->where('id', $projectId)
-            ->whereIn('type', ['strategy', 'program'])
             ->first();
 
         if ($parentProject && $parentProject->parent) {

app/Domain/Tickets/Repositories/Tickets.php

@@ -561,12 +561,18 @@ public function getAllBySearchCriteria(array $searchCriteria, string $sort = 'st
             });
         }
 
-        if (isset($searchCriteria['sprint']) && $searchCriteria['sprint'] > 0 && $searchCriteria['sprint'] != 'all') {
-            $sprintIds = explode(',', $searchCriteria['sprint']);
-            $query->whereIn('zp_tickets.sprint', $sprintIds);
+        if (isset($searchCriteria['sprint']) && $searchCriteria['sprint'] !== '' && $searchCriteria['sprint'] !== 'backlog') {
+            $sprintIds = array_values(array_filter(
+                array_map('trim', explode(',', (string) $searchCriteria['sprint'])),
+                static fn ($token) => ctype_digit($token) && (int) $token > 0
+            ));
+
+            if ($sprintIds !== []) {
+                $query->whereIn('zp_tickets.sprint', array_map('intval', $sprintIds));
+            }
         }
 
-        if (isset($searchCriteria['sprint']) && $searchCriteria['sprint'] == 'backlog') {
+        if (isset($searchCriteria['sprint']) && $searchCriteria['sprint'] === 'backlog') {
             $query->where(function ($q) {
                 $q->whereNull('zp_tickets.sprint')
                     ->orWhere('zp_tickets.sprint', 0)
@@ -1224,15 +1230,22 @@ public function getAllMilestones(array $searchCriteria, string $sort = 'standard
             });
         }
 
-        if (isset($searchCriteria['sprint']) && $searchCriteria['sprint'] > 0 && $searchCriteria['sprint'] != 'all') {
-            $sprintIds = explode(',', $searchCriteria['sprint']);
-            $query->where(function ($q) use ($sprintIds) {
-                $q->whereIn('zp_tickets.sprint', $sprintIds)
-                    ->orWhere('zp_tickets.type', 'milestone');
-            });
+        if (isset($searchCriteria['sprint']) && $searchCriteria['sprint'] !== '' && $searchCriteria['sprint'] !== 'backlog') {
+            $sprintIds = array_values(array_filter(
+                array_map('trim', explode(',', (string) $searchCriteria['sprint'])),
+                static fn ($token) => ctype_digit($token) && (int) $token > 0
+            ));
+
+            if ($sprintIds !== []) {
+                $intSprintIds = array_map('intval', $sprintIds);
+                $query->where(function ($q) use ($intSprintIds) {
+                    $q->whereIn('zp_tickets.sprint', $intSprintIds)
+                        ->orWhere('zp_tickets.type', 'milestone');
+                });
+            }
         }
 
-        if (isset($searchCriteria['sprint']) && $searchCriteria['sprint'] == 'backlog') {
+        if (isset($searchCriteria['sprint']) && $searchCriteria['sprint'] === 'backlog') {
             $query->where(function ($q) {
                 $q->whereNull('zp_tickets.sprint')
                     ->orWhere('zp_tickets.sprint', 0)

app/Domain/Tickets/Services/Tickets.php

@@ -2217,6 +2217,43 @@ public function patch($id, $params): bool
         return (bool) $return;
     }
 
+    /**
+     * moveTicket - Moves a ticket from one project to another. Milestone children will be moved as well.
+     *
+     * @throws BindingResolutionException
+     *
+     * @api
+     */
+    public function moveTicket(int $id, int $projectId): bool
+    {
+        $ticket = $this->getTicket($id);
+
+        if (! $ticket) {
+            return false;
+        }
+
+        if ($ticket->type == 'milestone') {
+            $milestoneTickets = $this->getAll(['milestone' => $ticket->id]);
+            foreach ($milestoneTickets as $childTicket) {
+                $childMoved = $this->patch($childTicket['id'], [
+                    'projectId' => $projectId,
+                    'sprint' => null,
+                ]);
+
+                if (! $childMoved) {
+                    return false;
+                }
+            }
+        }
+
+        return $this->patch($ticket->id, [
+            'projectId' => $projectId,
+            'sprint' => null,
+            'dependingTicketId' => null,
+            'milestoneid' => null,
+        ]);
+    }
+
     /**
      * @return bool|string[]
      *

public/assets/css/components/tiptap-editor.css

@@ -195,24 +195,33 @@
    ========================================================================== */
 
 .tiptap-editor .ProseMirror ul,
-.tiptap-editor .ProseMirror ol {
+.tiptap-editor .ProseMirror ol,
+.tiptap-content ul,
+.tiptap-content ol {
     padding-left: 1.5em;
     margin: 0 0 1em 0;
 }
 
-.tiptap-editor .ProseMirror li {
+.tiptap-editor .ProseMirror li,
+.tiptap-content li {
     margin-bottom: 0.25em;
 }
 
-.tiptap-editor .ProseMirror li p {
+.tiptap-editor .ProseMirror li > p,
+.tiptap-content li > p {
+    display: inline;
     margin: 0;
 }
 
 /* Nested lists */
 .tiptap-editor .ProseMirror ul ul,
 .tiptap-editor .ProseMirror ol ol,
 .tiptap-editor .ProseMirror ul ol,
-.tiptap-editor .ProseMirror ol ul {
+.tiptap-editor .ProseMirror ol ul,
+.tiptap-content ul ul,
+.tiptap-content ol ol,
+.tiptap-content ul ol,
+.tiptap-content ol ul {
     margin-top: 0.25em;
     margin-bottom: 0;
 }