Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
32 commits
Select commit Hold shift + click to select a range
8ecfb29
fix(FOUR-34369): eager-load processRequest.process in optimized index…
gproly Nov 11, 2026
49c3be3
fix(FOUR-34369): index tasks and requests after raw token persistence
gproly Nov 11, 2026
9ef26c3
fix(FOUR-34369): select correct columns for optimized draft eager load
gproly Nov 11, 2026
fbecbcb
fix(FOUR-34369): authorize v1.1 task completion before closed check
gproly Nov 11, 2026
a78a842
chore(FOUR-34369): align composer.json with develop
gproly Nov 11, 2026
d9f56e2
refactor(FOUR-34369): lower cognitive complexity of optimized index e…
gproly Nov 11, 2026
d19a15e
Merge branch 'nightly/2026.17-perfomance' into bugfix/FOUR-34369
gproly Nov 12, 2026
257a64c
fix(FOUR-34369): hide draft payload on task index without view permis…
gproly Nov 12, 2026
d618f49
fix(FOUR-34369): hide draft payload on task index without view permis…
gproly Nov 12, 2026
dd5188d
fix(FOUR-34369): hydrate token for draft view policy on partial proje…
gproly Nov 12, 2026
51641b4
fix(FOUR-34369): gate draft data on task index and fix manager checks
gproly Nov 12, 2026
752fb97
fix(FOUR-34369): align draft manager gate with loose id comparison
gproly Nov 12, 2026
90d2d07
fix(FOUR-34369): resolve process managers without serializing properties
gproly Nov 12, 2026
1df22bc
fix(FOUR-34369): align v1.1 task show include parsing with draft gates
gproly Nov 12, 2026
c9b1721
fix(FOUR-34369): add TaskDraftIncludes support class for task draft g…
gproly Nov 12, 2026
4c10273
Merge branch 'nightly/2026.17-perfomance' into bugfix/FOUR-34369
gproly Nov 12, 2026
36a628b
fix(FOUR-34369): match draft includes by path segment not substring
gproly Nov 12, 2026
fb8ffaf
fix(FOUR-34369): redact task draft whenever the relation is loaded
gproly Nov 12, 2026
35b1f64
fix(FOUR-34369): bind draft policy to persisted tokens on v1.1 show
gproly Nov 12, 2026
96bafa5
fix(FOUR-34369): harden task draft includes on index and show
gproly Nov 12, 2026
736bbb4
fix(FOUR-34369): treat draft include paths case-insensitively
gproly Nov 12, 2026
d8d53ac
refactor(FOUR-34369): reduce return count in draft payload helpers
gproly Nov 12, 2026
b64d057
fix(FOUR-34369): coerce null process index pmql query to empty string
gproly Nov 12, 2026
1e891d0
refactor(FOUR-34369): reduce return statements in resolveDraftPayload…
gproly Nov 13, 2026
02ee320
Merge branch 'nightly/2026.17-perfomance' into bugfix/FOUR-34369
gproly Nov 13, 2026
f2f36bf
fix(FOUR-34369): scope root draft sanitization and eager load to root…
gproly Nov 13, 2026
982f6bc
fix(FOUR-34369): treat Laravel include column suffixes in draft token…
gproly Nov 13, 2026
89b0636
fix(FOUR-34369): only consume task drafts on root include when drafts…
gproly Nov 13, 2026
365fd5f
test(FOUR-34369): assert nested draft include does not delete assigne…
gproly Nov 13, 2026
4ed37b4
perf(FOUR-34369): batch draft policy token loads on include=draft
gproly Nov 13, 2026
6a7f7f2
fix(FOUR-34369): trust DB for nested draft policy and limit consume t…
gproly Nov 13, 2026
f43c706
fix(tasks): pass managed visibility flag in optimized index
gproly Nov 13, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ProcessMaker/Http/Controllers/Api/ProcessController.php
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@
use ProcessMaker\Models\Process;
use ProcessMaker\Models\ProcessLaunchpad;
use ProcessMaker\Models\ProcessPermission;
use ProcessMaker\Models\User;
use ProcessMaker\Models\ProcessVersion;
use ProcessMaker\Models\Screen;
use ProcessMaker\Models\Script;
use ProcessMaker\Models\Template;
use ProcessMaker\Models\User;
use ProcessMaker\Nayra\Exceptions\ElementNotFoundException;
use ProcessMaker\Nayra\Services\FixBpmnSchemaService;
use ProcessMaker\Nayra\Storage\BpmnDocument;
Expand Down Expand Up @@ -158,7 +158,7 @@ public function index(Request $request)
// Filter by category status
$processes->categoryStatus($request->input('cat_status', null));

$pmqlError = $this->applyProcessIndexPmql($processes, $request->input('pmql', ''));
$pmqlError = $this->applyProcessIndexPmql($processes, (string) ($request->input('pmql') ?? ''));
if ($pmqlError !== null) {
return $pmqlError;
}
Expand Down
10 changes: 7 additions & 3 deletions ProcessMaker/Http/Controllers/Api/V1_1/TaskController.php
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,8 @@
use ProcessMaker\Models\User;
use ProcessMaker\ProcessTranslations\TranslationManager;
use ProcessMaker\Repositories\TaskV11ShowFastRepository;
use ProcessMaker\Traits\TaskControllerIndexMethods;
use ProcessMaker\Services\TaskCompletionRawService;
use ProcessMaker\Traits\TaskControllerIndexMethods;
use Symfony\Component\HttpKernel\Exception\NotFoundHttpException;

class TaskController extends Controller
Expand Down Expand Up @@ -61,12 +61,16 @@ public function indexOptimized(Request $request, $getTotal = false, ?User $user
$query = $this->indexOptimizedBaseQuery($request);
$this->applyIndexFieldSelection($query, $request);
$this->applyFilters($query, $request);
$this->excludeNonVisibleTasks($query, $request);
$resolveManagedProcessVisibility = $this->excludeNonVisibleTasks(
$query,
$request,
$request->input('processesIManage') === 'true'
);
$this->applyColumnOrdering($query, $request);
$this->applyStatusFilter($query, $request);

if ($request->input('processesIManage') === 'true') {
$this->applyProcessManager($query, $user, $request);
$this->applyProcessManager($query, $user, $request, $resolveManagedProcessVisibility);
} else {
$this->applyForCurrentUser($query, $user);
}
Expand Down
15 changes: 11 additions & 4 deletions ProcessMaker/Http/Resources/Task.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\Models\User;
use ProcessMaker\Services\SmartExtractConfiguration;
use ProcessMaker\Support\TaskDraftIncludes;
use ProcessMaker\Traits\TaskResourceIncludes;

class Task extends ApiResource
Expand Down Expand Up @@ -52,13 +53,18 @@ class Task extends ApiResource
*/
public function toArray($request)
{
$include = TaskDraftIncludes::parseIncludeList((string) $request->input('include', ''));

$array = parent::toArray($request);
$include = explode(',', $request->input('include', ''));
$array = $this->sanitizeDraftInTaskArray($array, $request);

$this->process = $this->resource->process;

foreach ($this->includeMethods as $key) {
if (!in_array($key, $include)) {
if ($key === 'draft' && TaskDraftIncludes::includesRootDraft($include)) {
continue;
}
if (!in_array($key, $include, true)) {
continue;
}
$method = 'include' . ucfirst($key);
Expand All @@ -82,9 +88,10 @@ public function toArray($request)

private function addCanViewParentRequest(&$array, $request)
{
$parentProcessRequest = $this->processRequest->parentRequest;
$processRequest = $this->processRequest;
$parentProcessRequest = $processRequest?->parentRequest;
$array['can_view_parent_request'] =
$parentProcessRequest && $request->user()->can('view', $parentProcessRequest);
$parentProcessRequest && $request->user()?->can('view', $parentProcessRequest);
}

private function addAssignableUsers(&$array, $include)
Expand Down
50 changes: 27 additions & 23 deletions ProcessMaker/Http/Resources/V1_1/TaskResource.php
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
use ProcessMaker\Http\Resources\Task;
use ProcessMaker\Models\ProcessRequestToken;
use ProcessMaker\ProcessTranslations\ProcessTranslation;
use ProcessMaker\Support\TaskDraftIncludes;
use ProcessMaker\Traits\TaskResourceIncludes;
use ProcessMaker\Traits\TaskScreenResourceTrait;

Expand Down Expand Up @@ -173,19 +174,19 @@ public static function preprocessInclude(Request $request, Builder $query): self
$query->addSelect($field);
}

$include = $request->query('include', []);
if ($include) {
$include = explode(',', $include);
}
$include = array_merge($include, self::$defaultIncludes);
$parsed = self::parseV11RequestIncludes($request);
$include = array_merge($parsed, self::$defaultIncludes);

if (in_array('data', $include)) {
if (in_array('data', $include, true)) {
$query->addSelect('process_request_id');
self::$defaultFieldsFor['processRequest'][] = 'data';
}

foreach (self::$includeMethods as $key) {
if (!in_array($key, $include)) {
if (!in_array($key, $include, true)) {
continue;
}
if ($key === 'draft' && !TaskDraftIncludes::includesRootDraft($parsed)) {
continue;
}

Expand All @@ -194,7 +195,10 @@ public static function preprocessInclude(Request $request, Builder $query): self

$model = $query->first();
foreach (self::$includeMethods as $key) {
if (!in_array($key, $include)) {
if (!in_array($key, $include, true)) {
continue;
}
if ($key === 'draft' && !TaskDraftIncludes::includesRootDraft($parsed)) {
continue;
}

Expand All @@ -209,10 +213,14 @@ public static function preprocessInclude(Request $request, Builder $query): self
*/
public static function fromTokenWithIncludes(ProcessRequestToken $token, Request $request): self
{
$include = self::resolveRequestIncludes($request);
$parsed = self::parseV11RequestIncludes($request);
$include = array_merge($parsed, self::$defaultIncludes);

foreach (self::$includeMethods as $key) {
if (!in_array($key, $include)) {
if (!in_array($key, $include, true)) {
continue;
}
if ($key === 'draft' && !TaskDraftIncludes::includesRootDraft($parsed)) {
continue;
}

Expand All @@ -226,14 +234,10 @@ public static function fromTokenWithIncludes(ProcessRequestToken $token, Request
return new static($token);
}

private static function resolveRequestIncludes(Request $request): array
/** @return list<string> */
private static function parseV11RequestIncludes(Request $request): array
{
$include = $request->query('include', []);
if ($include) {
$include = explode(',', $include);
}

return array_merge($include, self::$defaultIncludes);
return TaskDraftIncludes::parseIncludeList((string) $request->input('include', ''));
}

private static function includeRelationshipAlreadyLoaded(ProcessRequestToken $token, string $key): bool
Expand All @@ -251,13 +255,13 @@ private static function includeRelationshipAlreadyLoaded(ProcessRequestToken $to

private function processInclude(Request $request, array $array)
{
$include = $request->query('include', []);
if ($include) {
$include = explode(',', $include);
}
$include = self::parseV11RequestIncludes($request);

foreach (self::$includeMethods as $key) {
if (!in_array($key, $include)) {
if ($key === 'draft' && TaskDraftIncludes::includesRootDraft($include)) {
continue;
}
if (!in_array($key, $include, true)) {
continue;
}

Expand All @@ -270,6 +274,6 @@ private function processInclude(Request $request, array $array)
}
}

return $array;
return $this->sanitizeDraftInTaskArray($array, $request);
}
}
17 changes: 17 additions & 0 deletions ProcessMaker/Repositories/TokenPersistenceRawRepository.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,10 @@
namespace ProcessMaker\Repositories;

use Carbon\Carbon;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Facades\DB;
use Laravel\Scout\ModelObserver;
use Laravel\Scout\Searchable;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Models\ProcessRequestToken;

Expand Down Expand Up @@ -102,6 +105,7 @@ public function persistInstanceUpdated(ProcessRequest $instance): void

$this->runUpdate('process_requests', (int) $instance->getKey(), $payload);
$instance->syncChanges();
$this->syncSearchIndexAfterRawPersist($instance);
}

/**
Expand All @@ -128,6 +132,7 @@ private function updateToken(ProcessRequestToken $token, array $fields): void

$this->runUpdate('process_request_tokens', $tokenId, $payload);
$token->syncChanges();
$this->syncSearchIndexAfterRawPersist($token);
}

/**
Expand Down Expand Up @@ -159,4 +164,16 @@ private function serializeColumnValue(string $field, mixed $value): mixed

return $value;
}

/**
* Raw UPDATE bypasses Eloquent save(); run Scout's saved handler on searchable models.
*/
private function syncSearchIndexAfterRawPersist(Model $model): void
{
if (!in_array(Searchable::class, class_uses_recursive($model), true)) {
return;
}

(new ModelObserver)->saved($model);
}
}
8 changes: 4 additions & 4 deletions ProcessMaker/Services/TaskCompletionRawService.php
Original file line number Diff line number Diff line change
Expand Up @@ -42,10 +42,6 @@ public function completeTask(int $taskId, array $payload, User $user): array
throw new NotFoundHttpException(__('Task not found'));
}

if ($taskRow->status === 'CLOSED') {
abort(422, __('Task already closed'));
}

$processRow = $this->repository->findProcessForComplete((int) $taskRow->process_id);

if ($processRow === null) {
Expand All @@ -57,6 +53,10 @@ public function completeTask(int $taskId, array $payload, User $user): array
$this->engineBridge->hydrateTokenForPolicy($taskRow, $processRow)
);

if ($taskRow->status === 'CLOSED') {
abort(422, __('Task already closed'));
}

$requestRow = $this->repository->findProcessRequestForComplete((int) $taskRow->process_request_id);

if ($requestRow === null) {
Expand Down
Loading
Loading