FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls#6914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
caleeli merged 2 commits into from
Jun 6, 2024
Merged

FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls #6914

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7626508
FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls
julceslauhub Jun 6, 2024
61ca014
Merge branch 'feature/FOUR-15739' of https://github.com/ProcessMaker/…
julceslauhub Jun 6, 2024
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
11 changes: 11 additions & 0 deletions ProcessMaker/Events/ActivityAssigned.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -60,4 +60,15 @@ public function getProcessRequestToken()
{
return $this->processRequestToken;
}

/**
* Get data
*/
public function getData(): array
{
return [
'payloadUrl' => $this->payloadUrl,
'element_type' => $this->processRequestToken->element_type,
];
}
}
12 changes: 11 additions & 1 deletion ProcessMaker/Events/ProcessUpdated.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;

class ProcessUpdated implements ShouldBroadcastNow
{
Expand All@@ -17,19 +18,28 @@ class ProcessUpdated implements ShouldBroadcastNow

public $event;

public $tokenId;

public $elementType;

private $processRequest;

/**
* Create a new event instance.
*
* @return void
*/
public function __construct(ProcessRequest $processRequest, $event)
public function __construct(ProcessRequest $processRequest, $event, TokenInterface $token = null)
{
$this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
$this->event = $event;

$this->processRequest = $processRequest;

if ($token) {
$this->tokenId = $token->getId();
$this->elementType = $token->element_type;
}
}

/**
Expand Down
38 changes: 37 additions & 1 deletion ProcessMaker/Jobs/ExecuteScript.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use ProcessMaker\Events\ScriptResponseEvent;
use ProcessMaker\Models\Script;
use ProcessMaker\Models\User;
use ProcessMaker\Nayra\Managers\WorkflowManagerRabbitMq;
use Throwable;

class ExecuteScript implements ShouldQueue
Expand DownExpand Up@@ -62,7 +63,12 @@ public function __construct(ScriptInterface $script, User $current_user, $code,
*/
public function handle()
{
//throw new \Exception('This method must be overridden.');
$useNayraDocker = !empty(config('app.nayra_rest_api_host'));
$isPhp = strtolower($this->script->language) === 'php';
if ($isPhp && $useNayraDocker && $this->sync) {
return $this->handleNayraDocker();
}

try {
// Just set the code but do not save the object (preview only)
$this->script->code = $this->code;
Expand All@@ -82,6 +88,36 @@ public function handle()
}
}

/**
* Execute the script task using Nayra Docker.
*
* @return string|bool
*/
public function handleNayraDocker()
{
$engine = new WorkflowManagerRabbitMq();
$params = [
'name' => uniqid('script_', true),
'script' => $this->code,
'data' => $this->data,
'config' => $this->configuration,
'envVariables' => $engine->getEnvironmentVariables(),
];
$body = json_encode($params);
$url = config('app.nayra_rest_api_host') . '/run_script';
$ch = curl_init($url);
curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
curl_setopt($ch, CURLOPT_HTTPHEADER, [
'Content-Type: application/json',
'Content-Length: ' . strlen($body),
]);
$result = curl_exec($ch);
curl_close($ch);
return $result;
}

/**
* Send a response to the user interface
*
Expand Down
5 changes: 3 additions & 2 deletions ProcessMaker/Listeners/BpmnSubscriber.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,9 @@ public function onActivityActivated(ActivityActivatedEvent $event)
if ($token->user_id) {
$token->sendActivityActivatedNotifications();
}

event(new ActivityAssigned($event->token));
if ($event->token->element_type === 'task') {
event(new ActivityAssigned($event->token));
}
}

/**
Expand Down
2 changes: 1 addition & 1 deletion ProcessMaker/Managers/TaskSchedulerManager.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function scheduleTasks()

$this->removeExpiredLocks();

$tasks = ScheduledTask::all();
$tasks = ScheduledTask::cursor();

foreach ($tasks as $task) {
try {
Expand Down
6 changes: 3 additions & 3 deletions ProcessMaker/Models/ProcessRequest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -888,11 +888,11 @@ public function getVersionDefinitions($forceParse = false, $engine = null)
*
* @param string $eventName
*/
public function notifyProcessUpdated($eventName)
public function notifyProcessUpdated($eventName, TokenInterface $token = null)
{
$event = new ProcessUpdated($this, $eventName);
$event = new ProcessUpdated($this, $eventName, $token);
if ($this->parentRequest) {
$this->parentRequest->notifyProcessUpdated($eventName);
$this->parentRequest->notifyProcessUpdated($eventName, $token);
}
event($event);
}
Expand Down
4 changes: 3 additions & 1 deletion ProcessMaker/Models/ProcessRequestToken.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1150,6 +1150,8 @@ public function reassign($toUserId, User $requestingUser)
// Send a notification to the user
$notification = new TaskReassignmentNotification($this);
$this->user->notify($notification);
event(new ActivityAssigned($this));
if ($this->element_type === 'task') {
event(new ActivityAssigned($this));
}
}
}
2 changes: 1 addition & 1 deletion ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -682,7 +682,7 @@ private function dispatchAction(array $action, $subject = null): void
*
* @return array
*/
private function getEnvironmentVariables()
public function getEnvironmentVariables()
{
$environmentVariables = [];
EnvironmentVariable::chunk(50, function ($variables) use (&$environmentVariables) {
Expand Down
8 changes: 4 additions & 4 deletions ProcessMaker/Repositories/TokenRepository.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
$token->saveOrFail();
$token->setId($token->getKey());
$request = $token->getInstance();
$request->notifyProcessUpdated('ACTIVITY_ACTIVATED');
$request->notifyProcessUpdated('ACTIVITY_ACTIVATED', $token);
$this->instanceRepository->persistInstanceUpdated($token->getInstance());
}

Expand DownExpand Up@@ -192,7 +192,7 @@ public function persistStartEventTriggered(StartEventInterface $startEvent, Coll
$token->saveOrFail();
$token->setId($token->getKey());
$request = $token->getInstance();
$request->notifyProcessUpdated('START_EVENT_TRIGGERED');
$request->notifyProcessUpdated('START_EVENT_TRIGGERED', $token);
}

private function assignTaskUser(ActivityInterface $activity, TokenInterface $token, Instance $instance)
Expand DownExpand Up@@ -224,7 +224,7 @@ public function persistActivityException(ActivityInterface $activity, TokenInter
$token->save();
$token->setId($token->getKey());
$request = $token->getInstance();
$request->notifyProcessUpdated('ACTIVITY_EXCEPTION');
$request->notifyProcessUpdated('ACTIVITY_EXCEPTION', $token);
}

/**
Expand DownExpand Up@@ -258,7 +258,7 @@ public function persistActivityCompleted(ActivityInterface $activity, TokenInter
$token->save();
$token->setId($token->getKey());
$request = $token->getInstance();
$request->notifyProcessUpdated('ACTIVITY_COMPLETED');
$request->notifyProcessUpdated('ACTIVITY_COMPLETED', $token);
}

/**
Expand Down
4 changes: 3 additions & 1 deletion ProcessMaker/RollbackProcessRequest.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ private function rollbackToTask()
if ($this->newTask->user_id) {
$this->newTask->sendActivityActivatedNotifications();
}
event(new ActivityAssigned($this->newTask));
if ($this->newTask->element_type === 'task') {
event(new ActivityAssigned($this->newTask));
}

$this->addComment();
}
Expand Down
2 changes: 2 additions & 0 deletions config/app.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,8 @@
env('APP_URL', 'http://localhost')
)
),
'nayra_rest_api_host' => env('NAYRA_REST_API_HOST', ''),
'screen_task_cache_time' => env('SCREEN_TASK_CACHE_TIME', 86400),

// Allows our script executors to ignore invalid SSL. This should only be set to false for development.
'api_ssl_verify' => env('API_SSL_VERIFY', 'true'),
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls#6914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 2 commits into

from

Jun 6, 2024
 Merged


FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls
#6914
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7626508

FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls


julceslauhub Jun 6, 2024
61ca014

Merge branch 'feature/FOUR-15739' of https://github.com/ProcessMaker/…


julceslauhub Jun 6, 2024

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


11 changes: 11 additions & 0 deletions
ProcessMaker/Events/ActivityAssigned.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,4 +60,15 @@ public function getProcessRequestToken()
 {
 return $this->processRequestToken;
 }

 /**
 * Get data
 */
 public function getData(): array
 {
 return [
 'payloadUrl' => $this->payloadUrl,
 'element_type' => $this->processRequestToken->element_type,
 ];
 }
}

12 changes: 11 additions & 1 deletion
ProcessMaker/Events/ProcessUpdated.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;

class ProcessUpdated implements ShouldBroadcastNow
{
Expand All@@ -17,19 +18,28 @@ class ProcessUpdated implements ShouldBroadcastNow

 public $event;

 public $tokenId;

 public $elementType;

 private $processRequest;

 /**
 * Create a new event instance.
 *
 * @return void
 */
 public function __construct(ProcessRequest $processRequest, $event)
 public function __construct(ProcessRequest $processRequest, $event, TokenInterface $token = null)
 {
 $this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
 $this->event = $event;

 $this->processRequest = $processRequest;

 if ($token) {
 $this->tokenId = $token->getId();
 $this->elementType = $token->element_type;
 }
 }

 /**
Expand Down

38 changes: 37 additions & 1 deletion
ProcessMaker/Jobs/ExecuteScript.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use ProcessMaker\Events\ScriptResponseEvent;
use ProcessMaker\Models\Script;
use ProcessMaker\Models\User;
use ProcessMaker\Nayra\Managers\WorkflowManagerRabbitMq;
use Throwable;

class ExecuteScript implements ShouldQueue
Expand DownExpand Up@@ -62,7 +63,12 @@ public function __construct(ScriptInterface $script, User $current_user, $code,
 */
 public function handle()
 {
 //throw new \Exception('This method must be overridden.');
 $useNayraDocker = !empty(config('app.nayra_rest_api_host'));
 $isPhp = strtolower($this->script->language) === 'php';
 if ($isPhp && $useNayraDocker && $this->sync) {
 return $this->handleNayraDocker();
 }

 try {
 // Just set the code but do not save the object (preview only)
 $this->script->code = $this->code;
Expand All@@ -82,6 +88,36 @@ public function handle()
 }
 }

 /**
 * Execute the script task using Nayra Docker.
 *
 * @return string|bool
 */
 public function handleNayraDocker()
 {
 $engine = new WorkflowManagerRabbitMq();
 $params = [
 'name' => uniqid('script_', true),
 'script' => $this->code,
 'data' => $this->data,
 'config' => $this->configuration,
 'envVariables' => $engine->getEnvironmentVariables(),
 ];
 $body = json_encode($params);
 $url = config('app.nayra_rest_api_host') . '/run_script';
 $ch = curl_init($url);
 curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
 curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 curl_setopt($ch, CURLOPT_HTTPHEADER, [
 'Content-Type: application/json',
 'Content-Length: ' . strlen($body),
 ]);
 $result = curl_exec($ch);
 curl_close($ch);
 return $result;
 }

 /**
 * Send a response to the user interface
 *
Expand Down

5 changes: 3 additions & 2 deletions
ProcessMaker/Listeners/BpmnSubscriber.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,9 @@ public function onActivityActivated(ActivityActivatedEvent $event)
 if ($token->user_id) {
 $token->sendActivityActivatedNotifications();
 }

 event(new ActivityAssigned($event->token));
 if ($event->token->element_type === 'task') {
 event(new ActivityAssigned($event->token));
 }
 }

 /**
Expand Down

2 changes: 1 addition & 1 deletion
ProcessMaker/Managers/TaskSchedulerManager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function scheduleTasks()

 $this->removeExpiredLocks();

 $tasks = ScheduledTask::all();
 $tasks = ScheduledTask::cursor();

 foreach ($tasks as $task) {
 try {
Expand Down

6 changes: 3 additions & 3 deletions
ProcessMaker/Models/ProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -888,11 +888,11 @@ public function getVersionDefinitions($forceParse = false, $engine = null)
 *
 * @param string $eventName
 */
 public function notifyProcessUpdated($eventName)
 public function notifyProcessUpdated($eventName, TokenInterface $token = null)
 {
 $event = new ProcessUpdated($this, $eventName);
 $event = new ProcessUpdated($this, $eventName, $token);
 if ($this->parentRequest) {
 $this->parentRequest->notifyProcessUpdated($eventName);
 $this->parentRequest->notifyProcessUpdated($eventName, $token);
 }
 event($event);
 }
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1150,6 +1150,8 @@ public function reassign($toUserId, User $requestingUser)
 // Send a notification to the user
 $notification = new TaskReassignmentNotification($this);
 $this->user->notify($notification);
 event(new ActivityAssigned($this));
 if ($this->element_type === 'task') {
 event(new ActivityAssigned($this));
 }
 }
}

2 changes: 1 addition & 1 deletion
ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,7 +682,7 @@ private function dispatchAction(array $action, $subject = null): void
 *
 * @return array
 */
private function getEnvironmentVariables()
public function getEnvironmentVariables()
 {
 $environmentVariables = [];
 EnvironmentVariable::chunk(50, function ($variables) use (&$environmentVariables) {
Expand Down

8 changes: 4 additions & 4 deletions
ProcessMaker/Repositories/TokenRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED');
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED', $token);
 $this->instanceRepository->persistInstanceUpdated($token->getInstance());
 }

Expand DownExpand Up@@ -192,7 +192,7 @@ public function persistStartEventTriggered(StartEventInterface $startEvent, Coll
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED');
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED', $token);
 }

 private function assignTaskUser(ActivityInterface $activity, TokenInterface $token, Instance $instance)
Expand DownExpand Up@@ -224,7 +224,7 @@ public function persistActivityException(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION');
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION', $token);
 }

 /**
Expand DownExpand Up@@ -258,7 +258,7 @@ public function persistActivityCompleted(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED');
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED', $token);
 }

 /**
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/RollbackProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ private function rollbackToTask()
 if ($this->newTask->user_id) {
 $this->newTask->sendActivityActivatedNotifications();
 }
 event(new ActivityAssigned($this->newTask));
 if ($this->newTask->element_type === 'task') {
 event(new ActivityAssigned($this->newTask));
 }

 $this->addComment();
 }
Expand Down

2 changes: 2 additions & 0 deletions
config/app.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,8 @@
 env('APP_URL', 'http://localhost')
 )
 ),
 'nayra_rest_api_host' => env('NAYRA_REST_API_HOST', ''),
 'screen_task_cache_time' => env('SCREEN_TASK_CACHE_TIME', 86400),

 // Allows our script executors to ignore invalid SSL. This should only be set to false for development.
 'api_ssl_verify' => env('API_SSL_VERIFY', 'true'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls#6914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 2 commits into

from

Jun 6, 2024
 Merged


FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls
#6914
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7626508

FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls


julceslauhub Jun 6, 2024
61ca014

Merge branch 'feature/FOUR-15739' of https://github.com/ProcessMaker/…


julceslauhub Jun 6, 2024

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


11 changes: 11 additions & 0 deletions
ProcessMaker/Events/ActivityAssigned.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,4 +60,15 @@ public function getProcessRequestToken()
 {
 return $this->processRequestToken;
 }

 /**
 * Get data
 */
 public function getData(): array
 {
 return [
 'payloadUrl' => $this->payloadUrl,
 'element_type' => $this->processRequestToken->element_type,
 ];
 }
}

12 changes: 11 additions & 1 deletion
ProcessMaker/Events/ProcessUpdated.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;

class ProcessUpdated implements ShouldBroadcastNow
{
Expand All@@ -17,19 +18,28 @@ class ProcessUpdated implements ShouldBroadcastNow

 public $event;

 public $tokenId;

 public $elementType;

 private $processRequest;

 /**
 * Create a new event instance.
 *
 * @return void
 */
 public function __construct(ProcessRequest $processRequest, $event)
 public function __construct(ProcessRequest $processRequest, $event, TokenInterface $token = null)
 {
 $this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
 $this->event = $event;

 $this->processRequest = $processRequest;

 if ($token) {
 $this->tokenId = $token->getId();
 $this->elementType = $token->element_type;
 }
 }

 /**
Expand Down

38 changes: 37 additions & 1 deletion
ProcessMaker/Jobs/ExecuteScript.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use ProcessMaker\Events\ScriptResponseEvent;
use ProcessMaker\Models\Script;
use ProcessMaker\Models\User;
use ProcessMaker\Nayra\Managers\WorkflowManagerRabbitMq;
use Throwable;

class ExecuteScript implements ShouldQueue
Expand DownExpand Up@@ -62,7 +63,12 @@ public function __construct(ScriptInterface $script, User $current_user, $code,
 */
 public function handle()
 {
 //throw new \Exception('This method must be overridden.');
 $useNayraDocker = !empty(config('app.nayra_rest_api_host'));
 $isPhp = strtolower($this->script->language) === 'php';
 if ($isPhp && $useNayraDocker && $this->sync) {
 return $this->handleNayraDocker();
 }

 try {
 // Just set the code but do not save the object (preview only)
 $this->script->code = $this->code;
Expand All@@ -82,6 +88,36 @@ public function handle()
 }
 }

 /**
 * Execute the script task using Nayra Docker.
 *
 * @return string|bool
 */
 public function handleNayraDocker()
 {
 $engine = new WorkflowManagerRabbitMq();
 $params = [
 'name' => uniqid('script_', true),
 'script' => $this->code,
 'data' => $this->data,
 'config' => $this->configuration,
 'envVariables' => $engine->getEnvironmentVariables(),
 ];
 $body = json_encode($params);
 $url = config('app.nayra_rest_api_host') . '/run_script';
 $ch = curl_init($url);
 curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
 curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 curl_setopt($ch, CURLOPT_HTTPHEADER, [
 'Content-Type: application/json',
 'Content-Length: ' . strlen($body),
 ]);
 $result = curl_exec($ch);
 curl_close($ch);
 return $result;
 }

 /**
 * Send a response to the user interface
 *
Expand Down

5 changes: 3 additions & 2 deletions
ProcessMaker/Listeners/BpmnSubscriber.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,9 @@ public function onActivityActivated(ActivityActivatedEvent $event)
 if ($token->user_id) {
 $token->sendActivityActivatedNotifications();
 }

 event(new ActivityAssigned($event->token));
 if ($event->token->element_type === 'task') {
 event(new ActivityAssigned($event->token));
 }
 }

 /**
Expand Down

2 changes: 1 addition & 1 deletion
ProcessMaker/Managers/TaskSchedulerManager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function scheduleTasks()

 $this->removeExpiredLocks();

 $tasks = ScheduledTask::all();
 $tasks = ScheduledTask::cursor();

 foreach ($tasks as $task) {
 try {
Expand Down

6 changes: 3 additions & 3 deletions
ProcessMaker/Models/ProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -888,11 +888,11 @@ public function getVersionDefinitions($forceParse = false, $engine = null)
 *
 * @param string $eventName
 */
 public function notifyProcessUpdated($eventName)
 public function notifyProcessUpdated($eventName, TokenInterface $token = null)
 {
 $event = new ProcessUpdated($this, $eventName);
 $event = new ProcessUpdated($this, $eventName, $token);
 if ($this->parentRequest) {
 $this->parentRequest->notifyProcessUpdated($eventName);
 $this->parentRequest->notifyProcessUpdated($eventName, $token);
 }
 event($event);
 }
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1150,6 +1150,8 @@ public function reassign($toUserId, User $requestingUser)
 // Send a notification to the user
 $notification = new TaskReassignmentNotification($this);
 $this->user->notify($notification);
 event(new ActivityAssigned($this));
 if ($this->element_type === 'task') {
 event(new ActivityAssigned($this));
 }
 }
}

2 changes: 1 addition & 1 deletion
ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,7 +682,7 @@ private function dispatchAction(array $action, $subject = null): void
 *
 * @return array
 */
private function getEnvironmentVariables()
public function getEnvironmentVariables()
 {
 $environmentVariables = [];
 EnvironmentVariable::chunk(50, function ($variables) use (&$environmentVariables) {
Expand Down

8 changes: 4 additions & 4 deletions
ProcessMaker/Repositories/TokenRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED');
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED', $token);
 $this->instanceRepository->persistInstanceUpdated($token->getInstance());
 }

Expand DownExpand Up@@ -192,7 +192,7 @@ public function persistStartEventTriggered(StartEventInterface $startEvent, Coll
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED');
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED', $token);
 }

 private function assignTaskUser(ActivityInterface $activity, TokenInterface $token, Instance $instance)
Expand DownExpand Up@@ -224,7 +224,7 @@ public function persistActivityException(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION');
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION', $token);
 }

 /**
Expand DownExpand Up@@ -258,7 +258,7 @@ public function persistActivityCompleted(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED');
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED', $token);
 }

 /**
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/RollbackProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ private function rollbackToTask()
 if ($this->newTask->user_id) {
 $this->newTask->sendActivityActivatedNotifications();
 }
 event(new ActivityAssigned($this->newTask));
 if ($this->newTask->element_type === 'task') {
 event(new ActivityAssigned($this->newTask));
 }

 $this->addComment();
 }
Expand Down

2 changes: 2 additions & 0 deletions
config/app.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,8 @@
 env('APP_URL', 'http://localhost')
 )
 ),
 'nayra_rest_api_host' => env('NAYRA_REST_API_HOST', ''),
 'screen_task_cache_time' => env('SCREEN_TASK_CACHE_TIME', 86400),

 // Allows our script executors to ignore invalid SSL. This should only be set to false for development.
 'api_ssl_verify' => env('API_SSL_VERIFY', 'true'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls#6914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 2 commits into

from

Jun 6, 2024
 Merged


FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls
#6914
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7626508

FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls


julceslauhub Jun 6, 2024
61ca014

Merge branch 'feature/FOUR-15739' of https://github.com/ProcessMaker/…


julceslauhub Jun 6, 2024

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


11 changes: 11 additions & 0 deletions
ProcessMaker/Events/ActivityAssigned.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,4 +60,15 @@ public function getProcessRequestToken()
 {
 return $this->processRequestToken;
 }

 /**
 * Get data
 */
 public function getData(): array
 {
 return [
 'payloadUrl' => $this->payloadUrl,
 'element_type' => $this->processRequestToken->element_type,
 ];
 }
}

12 changes: 11 additions & 1 deletion
ProcessMaker/Events/ProcessUpdated.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;

class ProcessUpdated implements ShouldBroadcastNow
{
Expand All@@ -17,19 +18,28 @@ class ProcessUpdated implements ShouldBroadcastNow

 public $event;

 public $tokenId;

 public $elementType;

 private $processRequest;

 /**
 * Create a new event instance.
 *
 * @return void
 */
 public function __construct(ProcessRequest $processRequest, $event)
 public function __construct(ProcessRequest $processRequest, $event, TokenInterface $token = null)
 {
 $this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
 $this->event = $event;

 $this->processRequest = $processRequest;

 if ($token) {
 $this->tokenId = $token->getId();
 $this->elementType = $token->element_type;
 }
 }

 /**
Expand Down

38 changes: 37 additions & 1 deletion
ProcessMaker/Jobs/ExecuteScript.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use ProcessMaker\Events\ScriptResponseEvent;
use ProcessMaker\Models\Script;
use ProcessMaker\Models\User;
use ProcessMaker\Nayra\Managers\WorkflowManagerRabbitMq;
use Throwable;

class ExecuteScript implements ShouldQueue
Expand DownExpand Up@@ -62,7 +63,12 @@ public function __construct(ScriptInterface $script, User $current_user, $code,
 */
 public function handle()
 {
 //throw new \Exception('This method must be overridden.');
 $useNayraDocker = !empty(config('app.nayra_rest_api_host'));
 $isPhp = strtolower($this->script->language) === 'php';
 if ($isPhp && $useNayraDocker && $this->sync) {
 return $this->handleNayraDocker();
 }

 try {
 // Just set the code but do not save the object (preview only)
 $this->script->code = $this->code;
Expand All@@ -82,6 +88,36 @@ public function handle()
 }
 }

 /**
 * Execute the script task using Nayra Docker.
 *
 * @return string|bool
 */
 public function handleNayraDocker()
 {
 $engine = new WorkflowManagerRabbitMq();
 $params = [
 'name' => uniqid('script_', true),
 'script' => $this->code,
 'data' => $this->data,
 'config' => $this->configuration,
 'envVariables' => $engine->getEnvironmentVariables(),
 ];
 $body = json_encode($params);
 $url = config('app.nayra_rest_api_host') . '/run_script';
 $ch = curl_init($url);
 curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
 curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 curl_setopt($ch, CURLOPT_HTTPHEADER, [
 'Content-Type: application/json',
 'Content-Length: ' . strlen($body),
 ]);
 $result = curl_exec($ch);
 curl_close($ch);
 return $result;
 }

 /**
 * Send a response to the user interface
 *
Expand Down

5 changes: 3 additions & 2 deletions
ProcessMaker/Listeners/BpmnSubscriber.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,9 @@ public function onActivityActivated(ActivityActivatedEvent $event)
 if ($token->user_id) {
 $token->sendActivityActivatedNotifications();
 }

 event(new ActivityAssigned($event->token));
 if ($event->token->element_type === 'task') {
 event(new ActivityAssigned($event->token));
 }
 }

 /**
Expand Down

2 changes: 1 addition & 1 deletion
ProcessMaker/Managers/TaskSchedulerManager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function scheduleTasks()

 $this->removeExpiredLocks();

 $tasks = ScheduledTask::all();
 $tasks = ScheduledTask::cursor();

 foreach ($tasks as $task) {
 try {
Expand Down

6 changes: 3 additions & 3 deletions
ProcessMaker/Models/ProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -888,11 +888,11 @@ public function getVersionDefinitions($forceParse = false, $engine = null)
 *
 * @param string $eventName
 */
 public function notifyProcessUpdated($eventName)
 public function notifyProcessUpdated($eventName, TokenInterface $token = null)
 {
 $event = new ProcessUpdated($this, $eventName);
 $event = new ProcessUpdated($this, $eventName, $token);
 if ($this->parentRequest) {
 $this->parentRequest->notifyProcessUpdated($eventName);
 $this->parentRequest->notifyProcessUpdated($eventName, $token);
 }
 event($event);
 }
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1150,6 +1150,8 @@ public function reassign($toUserId, User $requestingUser)
 // Send a notification to the user
 $notification = new TaskReassignmentNotification($this);
 $this->user->notify($notification);
 event(new ActivityAssigned($this));
 if ($this->element_type === 'task') {
 event(new ActivityAssigned($this));
 }
 }
}

2 changes: 1 addition & 1 deletion
ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,7 +682,7 @@ private function dispatchAction(array $action, $subject = null): void
 *
 * @return array
 */
private function getEnvironmentVariables()
public function getEnvironmentVariables()
 {
 $environmentVariables = [];
 EnvironmentVariable::chunk(50, function ($variables) use (&$environmentVariables) {
Expand Down

8 changes: 4 additions & 4 deletions
ProcessMaker/Repositories/TokenRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED');
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED', $token);
 $this->instanceRepository->persistInstanceUpdated($token->getInstance());
 }

Expand DownExpand Up@@ -192,7 +192,7 @@ public function persistStartEventTriggered(StartEventInterface $startEvent, Coll
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED');
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED', $token);
 }

 private function assignTaskUser(ActivityInterface $activity, TokenInterface $token, Instance $instance)
Expand DownExpand Up@@ -224,7 +224,7 @@ public function persistActivityException(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION');
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION', $token);
 }

 /**
Expand DownExpand Up@@ -258,7 +258,7 @@ public function persistActivityCompleted(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED');
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED', $token);
 }

 /**
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/RollbackProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ private function rollbackToTask()
 if ($this->newTask->user_id) {
 $this->newTask->sendActivityActivatedNotifications();
 }
 event(new ActivityAssigned($this->newTask));
 if ($this->newTask->element_type === 'task') {
 event(new ActivityAssigned($this->newTask));
 }

 $this->addComment();
 }
Expand Down

2 changes: 2 additions & 0 deletions
config/app.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,8 @@
 env('APP_URL', 'http://localhost')
 )
 ),
 'nayra_rest_api_host' => env('NAYRA_REST_API_HOST', ''),
 'screen_task_cache_time' => env('SCREEN_TASK_CACHE_TIME', 86400),

 // Allows our script executors to ignore invalid SSL. This should only be set to false for development.
 'api_ssl_verify' => env('API_SSL_VERIFY', 'true'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls#6914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 2 commits into

from

Jun 6, 2024
 Merged


FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls
#6914
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7626508

FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls


julceslauhub Jun 6, 2024
61ca014

Merge branch 'feature/FOUR-15739' of https://github.com/ProcessMaker/…


julceslauhub Jun 6, 2024

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


11 changes: 11 additions & 0 deletions
ProcessMaker/Events/ActivityAssigned.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,4 +60,15 @@ public function getProcessRequestToken()
 {
 return $this->processRequestToken;
 }

 /**
 * Get data
 */
 public function getData(): array
 {
 return [
 'payloadUrl' => $this->payloadUrl,
 'element_type' => $this->processRequestToken->element_type,
 ];
 }
}

12 changes: 11 additions & 1 deletion
ProcessMaker/Events/ProcessUpdated.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;

class ProcessUpdated implements ShouldBroadcastNow
{
Expand All@@ -17,19 +18,28 @@ class ProcessUpdated implements ShouldBroadcastNow

 public $event;

 public $tokenId;

 public $elementType;

 private $processRequest;

 /**
 * Create a new event instance.
 *
 * @return void
 */
 public function __construct(ProcessRequest $processRequest, $event)
 public function __construct(ProcessRequest $processRequest, $event, TokenInterface $token = null)
 {
 $this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
 $this->event = $event;

 $this->processRequest = $processRequest;

 if ($token) {
 $this->tokenId = $token->getId();
 $this->elementType = $token->element_type;
 }
 }

 /**
Expand Down

38 changes: 37 additions & 1 deletion
ProcessMaker/Jobs/ExecuteScript.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use ProcessMaker\Events\ScriptResponseEvent;
use ProcessMaker\Models\Script;
use ProcessMaker\Models\User;
use ProcessMaker\Nayra\Managers\WorkflowManagerRabbitMq;
use Throwable;

class ExecuteScript implements ShouldQueue
Expand DownExpand Up@@ -62,7 +63,12 @@ public function __construct(ScriptInterface $script, User $current_user, $code,
 */
 public function handle()
 {
 //throw new \Exception('This method must be overridden.');
 $useNayraDocker = !empty(config('app.nayra_rest_api_host'));
 $isPhp = strtolower($this->script->language) === 'php';
 if ($isPhp && $useNayraDocker && $this->sync) {
 return $this->handleNayraDocker();
 }

 try {
 // Just set the code but do not save the object (preview only)
 $this->script->code = $this->code;
Expand All@@ -82,6 +88,36 @@ public function handle()
 }
 }

 /**
 * Execute the script task using Nayra Docker.
 *
 * @return string|bool
 */
 public function handleNayraDocker()
 {
 $engine = new WorkflowManagerRabbitMq();
 $params = [
 'name' => uniqid('script_', true),
 'script' => $this->code,
 'data' => $this->data,
 'config' => $this->configuration,
 'envVariables' => $engine->getEnvironmentVariables(),
 ];
 $body = json_encode($params);
 $url = config('app.nayra_rest_api_host') . '/run_script';
 $ch = curl_init($url);
 curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
 curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 curl_setopt($ch, CURLOPT_HTTPHEADER, [
 'Content-Type: application/json',
 'Content-Length: ' . strlen($body),
 ]);
 $result = curl_exec($ch);
 curl_close($ch);
 return $result;
 }

 /**
 * Send a response to the user interface
 *
Expand Down

5 changes: 3 additions & 2 deletions
ProcessMaker/Listeners/BpmnSubscriber.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,9 @@ public function onActivityActivated(ActivityActivatedEvent $event)
 if ($token->user_id) {
 $token->sendActivityActivatedNotifications();
 }

 event(new ActivityAssigned($event->token));
 if ($event->token->element_type === 'task') {
 event(new ActivityAssigned($event->token));
 }
 }

 /**
Expand Down

2 changes: 1 addition & 1 deletion
ProcessMaker/Managers/TaskSchedulerManager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function scheduleTasks()

 $this->removeExpiredLocks();

 $tasks = ScheduledTask::all();
 $tasks = ScheduledTask::cursor();

 foreach ($tasks as $task) {
 try {
Expand Down

6 changes: 3 additions & 3 deletions
ProcessMaker/Models/ProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -888,11 +888,11 @@ public function getVersionDefinitions($forceParse = false, $engine = null)
 *
 * @param string $eventName
 */
 public function notifyProcessUpdated($eventName)
 public function notifyProcessUpdated($eventName, TokenInterface $token = null)
 {
 $event = new ProcessUpdated($this, $eventName);
 $event = new ProcessUpdated($this, $eventName, $token);
 if ($this->parentRequest) {
 $this->parentRequest->notifyProcessUpdated($eventName);
 $this->parentRequest->notifyProcessUpdated($eventName, $token);
 }
 event($event);
 }
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1150,6 +1150,8 @@ public function reassign($toUserId, User $requestingUser)
 // Send a notification to the user
 $notification = new TaskReassignmentNotification($this);
 $this->user->notify($notification);
 event(new ActivityAssigned($this));
 if ($this->element_type === 'task') {
 event(new ActivityAssigned($this));
 }
 }
}

2 changes: 1 addition & 1 deletion
ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,7 +682,7 @@ private function dispatchAction(array $action, $subject = null): void
 *
 * @return array
 */
private function getEnvironmentVariables()
public function getEnvironmentVariables()
 {
 $environmentVariables = [];
 EnvironmentVariable::chunk(50, function ($variables) use (&$environmentVariables) {
Expand Down

8 changes: 4 additions & 4 deletions
ProcessMaker/Repositories/TokenRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED');
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED', $token);
 $this->instanceRepository->persistInstanceUpdated($token->getInstance());
 }

Expand DownExpand Up@@ -192,7 +192,7 @@ public function persistStartEventTriggered(StartEventInterface $startEvent, Coll
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED');
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED', $token);
 }

 private function assignTaskUser(ActivityInterface $activity, TokenInterface $token, Instance $instance)
Expand DownExpand Up@@ -224,7 +224,7 @@ public function persistActivityException(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION');
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION', $token);
 }

 /**
Expand DownExpand Up@@ -258,7 +258,7 @@ public function persistActivityCompleted(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED');
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED', $token);
 }

 /**
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/RollbackProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ private function rollbackToTask()
 if ($this->newTask->user_id) {
 $this->newTask->sendActivityActivatedNotifications();
 }
 event(new ActivityAssigned($this->newTask));
 if ($this->newTask->element_type === 'task') {
 event(new ActivityAssigned($this->newTask));
 }

 $this->addComment();
 }
Expand Down

2 changes: 2 additions & 0 deletions
config/app.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,8 @@
 env('APP_URL', 'http://localhost')
 )
 ),
 'nayra_rest_api_host' => env('NAYRA_REST_API_HOST', ''),
 'screen_task_cache_time' => env('SCREEN_TASK_CACHE_TIME', 86400),

 // Allows our script executors to ignore invalid SSL. This should only be set to false for development.
 'api_ssl_verify' => env('API_SSL_VERIFY', 'true'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls#6914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 2 commits into

from

Jun 6, 2024
 Merged


FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls
#6914
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7626508

FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls


julceslauhub Jun 6, 2024
61ca014

Merge branch 'feature/FOUR-15739' of https://github.com/ProcessMaker/…


julceslauhub Jun 6, 2024

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


11 changes: 11 additions & 0 deletions
ProcessMaker/Events/ActivityAssigned.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,4 +60,15 @@ public function getProcessRequestToken()
 {
 return $this->processRequestToken;
 }

 /**
 * Get data
 */
 public function getData(): array
 {
 return [
 'payloadUrl' => $this->payloadUrl,
 'element_type' => $this->processRequestToken->element_type,
 ];
 }
}

12 changes: 11 additions & 1 deletion
ProcessMaker/Events/ProcessUpdated.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;

class ProcessUpdated implements ShouldBroadcastNow
{
Expand All@@ -17,19 +18,28 @@ class ProcessUpdated implements ShouldBroadcastNow

 public $event;

 public $tokenId;

 public $elementType;

 private $processRequest;

 /**
 * Create a new event instance.
 *
 * @return void
 */
 public function __construct(ProcessRequest $processRequest, $event)
 public function __construct(ProcessRequest $processRequest, $event, TokenInterface $token = null)
 {
 $this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
 $this->event = $event;

 $this->processRequest = $processRequest;

 if ($token) {
 $this->tokenId = $token->getId();
 $this->elementType = $token->element_type;
 }
 }

 /**
Expand Down

38 changes: 37 additions & 1 deletion
ProcessMaker/Jobs/ExecuteScript.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use ProcessMaker\Events\ScriptResponseEvent;
use ProcessMaker\Models\Script;
use ProcessMaker\Models\User;
use ProcessMaker\Nayra\Managers\WorkflowManagerRabbitMq;
use Throwable;

class ExecuteScript implements ShouldQueue
Expand DownExpand Up@@ -62,7 +63,12 @@ public function __construct(ScriptInterface $script, User $current_user, $code,
 */
 public function handle()
 {
 //throw new \Exception('This method must be overridden.');
 $useNayraDocker = !empty(config('app.nayra_rest_api_host'));
 $isPhp = strtolower($this->script->language) === 'php';
 if ($isPhp && $useNayraDocker && $this->sync) {
 return $this->handleNayraDocker();
 }

 try {
 // Just set the code but do not save the object (preview only)
 $this->script->code = $this->code;
Expand All@@ -82,6 +88,36 @@ public function handle()
 }
 }

 /**
 * Execute the script task using Nayra Docker.
 *
 * @return string|bool
 */
 public function handleNayraDocker()
 {
 $engine = new WorkflowManagerRabbitMq();
 $params = [
 'name' => uniqid('script_', true),
 'script' => $this->code,
 'data' => $this->data,
 'config' => $this->configuration,
 'envVariables' => $engine->getEnvironmentVariables(),
 ];
 $body = json_encode($params);
 $url = config('app.nayra_rest_api_host') . '/run_script';
 $ch = curl_init($url);
 curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
 curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 curl_setopt($ch, CURLOPT_HTTPHEADER, [
 'Content-Type: application/json',
 'Content-Length: ' . strlen($body),
 ]);
 $result = curl_exec($ch);
 curl_close($ch);
 return $result;
 }

 /**
 * Send a response to the user interface
 *
Expand Down

5 changes: 3 additions & 2 deletions
ProcessMaker/Listeners/BpmnSubscriber.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,9 @@ public function onActivityActivated(ActivityActivatedEvent $event)
 if ($token->user_id) {
 $token->sendActivityActivatedNotifications();
 }

 event(new ActivityAssigned($event->token));
 if ($event->token->element_type === 'task') {
 event(new ActivityAssigned($event->token));
 }
 }

 /**
Expand Down

2 changes: 1 addition & 1 deletion
ProcessMaker/Managers/TaskSchedulerManager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function scheduleTasks()

 $this->removeExpiredLocks();

 $tasks = ScheduledTask::all();
 $tasks = ScheduledTask::cursor();

 foreach ($tasks as $task) {
 try {
Expand Down

6 changes: 3 additions & 3 deletions
ProcessMaker/Models/ProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -888,11 +888,11 @@ public function getVersionDefinitions($forceParse = false, $engine = null)
 *
 * @param string $eventName
 */
 public function notifyProcessUpdated($eventName)
 public function notifyProcessUpdated($eventName, TokenInterface $token = null)
 {
 $event = new ProcessUpdated($this, $eventName);
 $event = new ProcessUpdated($this, $eventName, $token);
 if ($this->parentRequest) {
 $this->parentRequest->notifyProcessUpdated($eventName);
 $this->parentRequest->notifyProcessUpdated($eventName, $token);
 }
 event($event);
 }
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1150,6 +1150,8 @@ public function reassign($toUserId, User $requestingUser)
 // Send a notification to the user
 $notification = new TaskReassignmentNotification($this);
 $this->user->notify($notification);
 event(new ActivityAssigned($this));
 if ($this->element_type === 'task') {
 event(new ActivityAssigned($this));
 }
 }
}

2 changes: 1 addition & 1 deletion
ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,7 +682,7 @@ private function dispatchAction(array $action, $subject = null): void
 *
 * @return array
 */
private function getEnvironmentVariables()
public function getEnvironmentVariables()
 {
 $environmentVariables = [];
 EnvironmentVariable::chunk(50, function ($variables) use (&$environmentVariables) {
Expand Down

8 changes: 4 additions & 4 deletions
ProcessMaker/Repositories/TokenRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED');
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED', $token);
 $this->instanceRepository->persistInstanceUpdated($token->getInstance());
 }

Expand DownExpand Up@@ -192,7 +192,7 @@ public function persistStartEventTriggered(StartEventInterface $startEvent, Coll
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED');
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED', $token);
 }

 private function assignTaskUser(ActivityInterface $activity, TokenInterface $token, Instance $instance)
Expand DownExpand Up@@ -224,7 +224,7 @@ public function persistActivityException(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION');
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION', $token);
 }

 /**
Expand DownExpand Up@@ -258,7 +258,7 @@ public function persistActivityCompleted(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED');
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED', $token);
 }

 /**
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/RollbackProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ private function rollbackToTask()
 if ($this->newTask->user_id) {
 $this->newTask->sendActivityActivatedNotifications();
 }
 event(new ActivityAssigned($this->newTask));
 if ($this->newTask->element_type === 'task') {
 event(new ActivityAssigned($this->newTask));
 }

 $this->addComment();
 }
Expand Down

2 changes: 2 additions & 0 deletions
config/app.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,8 @@
 env('APP_URL', 'http://localhost')
 )
 ),
 'nayra_rest_api_host' => env('NAYRA_REST_API_HOST', ''),
 'screen_task_cache_time' => env('SCREEN_TASK_CACHE_TIME', 86400),

 // Allows our script executors to ignore invalid SSL. This should only be set to false for development.
 'api_ssl_verify' => env('API_SSL_VERIFY', 'true'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls#6914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 2 commits into

from

Jun 6, 2024
 Merged


FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls
#6914
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7626508

FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls


julceslauhub Jun 6, 2024
61ca014

Merge branch 'feature/FOUR-15739' of https://github.com/ProcessMaker/…


julceslauhub Jun 6, 2024

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


11 changes: 11 additions & 0 deletions
ProcessMaker/Events/ActivityAssigned.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,4 +60,15 @@ public function getProcessRequestToken()
 {
 return $this->processRequestToken;
 }

 /**
 * Get data
 */
 public function getData(): array
 {
 return [
 'payloadUrl' => $this->payloadUrl,
 'element_type' => $this->processRequestToken->element_type,
 ];
 }
}

12 changes: 11 additions & 1 deletion
ProcessMaker/Events/ProcessUpdated.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;

class ProcessUpdated implements ShouldBroadcastNow
{
Expand All@@ -17,19 +18,28 @@ class ProcessUpdated implements ShouldBroadcastNow

 public $event;

 public $tokenId;

 public $elementType;

 private $processRequest;

 /**
 * Create a new event instance.
 *
 * @return void
 */
 public function __construct(ProcessRequest $processRequest, $event)
 public function __construct(ProcessRequest $processRequest, $event, TokenInterface $token = null)
 {
 $this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
 $this->event = $event;

 $this->processRequest = $processRequest;

 if ($token) {
 $this->tokenId = $token->getId();
 $this->elementType = $token->element_type;
 }
 }

 /**
Expand Down

38 changes: 37 additions & 1 deletion
ProcessMaker/Jobs/ExecuteScript.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use ProcessMaker\Events\ScriptResponseEvent;
use ProcessMaker\Models\Script;
use ProcessMaker\Models\User;
use ProcessMaker\Nayra\Managers\WorkflowManagerRabbitMq;
use Throwable;

class ExecuteScript implements ShouldQueue
Expand DownExpand Up@@ -62,7 +63,12 @@ public function __construct(ScriptInterface $script, User $current_user, $code,
 */
 public function handle()
 {
 //throw new \Exception('This method must be overridden.');
 $useNayraDocker = !empty(config('app.nayra_rest_api_host'));
 $isPhp = strtolower($this->script->language) === 'php';
 if ($isPhp && $useNayraDocker && $this->sync) {
 return $this->handleNayraDocker();
 }

 try {
 // Just set the code but do not save the object (preview only)
 $this->script->code = $this->code;
Expand All@@ -82,6 +88,36 @@ public function handle()
 }
 }

 /**
 * Execute the script task using Nayra Docker.
 *
 * @return string|bool
 */
 public function handleNayraDocker()
 {
 $engine = new WorkflowManagerRabbitMq();
 $params = [
 'name' => uniqid('script_', true),
 'script' => $this->code,
 'data' => $this->data,
 'config' => $this->configuration,
 'envVariables' => $engine->getEnvironmentVariables(),
 ];
 $body = json_encode($params);
 $url = config('app.nayra_rest_api_host') . '/run_script';
 $ch = curl_init($url);
 curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
 curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 curl_setopt($ch, CURLOPT_HTTPHEADER, [
 'Content-Type: application/json',
 'Content-Length: ' . strlen($body),
 ]);
 $result = curl_exec($ch);
 curl_close($ch);
 return $result;
 }

 /**
 * Send a response to the user interface
 *
Expand Down

5 changes: 3 additions & 2 deletions
ProcessMaker/Listeners/BpmnSubscriber.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,9 @@ public function onActivityActivated(ActivityActivatedEvent $event)
 if ($token->user_id) {
 $token->sendActivityActivatedNotifications();
 }

 event(new ActivityAssigned($event->token));
 if ($event->token->element_type === 'task') {
 event(new ActivityAssigned($event->token));
 }
 }

 /**
Expand Down

2 changes: 1 addition & 1 deletion
ProcessMaker/Managers/TaskSchedulerManager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function scheduleTasks()

 $this->removeExpiredLocks();

 $tasks = ScheduledTask::all();
 $tasks = ScheduledTask::cursor();

 foreach ($tasks as $task) {
 try {
Expand Down

6 changes: 3 additions & 3 deletions
ProcessMaker/Models/ProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -888,11 +888,11 @@ public function getVersionDefinitions($forceParse = false, $engine = null)
 *
 * @param string $eventName
 */
 public function notifyProcessUpdated($eventName)
 public function notifyProcessUpdated($eventName, TokenInterface $token = null)
 {
 $event = new ProcessUpdated($this, $eventName);
 $event = new ProcessUpdated($this, $eventName, $token);
 if ($this->parentRequest) {
 $this->parentRequest->notifyProcessUpdated($eventName);
 $this->parentRequest->notifyProcessUpdated($eventName, $token);
 }
 event($event);
 }
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1150,6 +1150,8 @@ public function reassign($toUserId, User $requestingUser)
 // Send a notification to the user
 $notification = new TaskReassignmentNotification($this);
 $this->user->notify($notification);
 event(new ActivityAssigned($this));
 if ($this->element_type === 'task') {
 event(new ActivityAssigned($this));
 }
 }
}

2 changes: 1 addition & 1 deletion
ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,7 +682,7 @@ private function dispatchAction(array $action, $subject = null): void
 *
 * @return array
 */
private function getEnvironmentVariables()
public function getEnvironmentVariables()
 {
 $environmentVariables = [];
 EnvironmentVariable::chunk(50, function ($variables) use (&$environmentVariables) {
Expand Down

8 changes: 4 additions & 4 deletions
ProcessMaker/Repositories/TokenRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED');
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED', $token);
 $this->instanceRepository->persistInstanceUpdated($token->getInstance());
 }

Expand DownExpand Up@@ -192,7 +192,7 @@ public function persistStartEventTriggered(StartEventInterface $startEvent, Coll
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED');
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED', $token);
 }

 private function assignTaskUser(ActivityInterface $activity, TokenInterface $token, Instance $instance)
Expand DownExpand Up@@ -224,7 +224,7 @@ public function persistActivityException(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION');
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION', $token);
 }

 /**
Expand DownExpand Up@@ -258,7 +258,7 @@ public function persistActivityCompleted(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED');
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED', $token);
 }

 /**
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/RollbackProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ private function rollbackToTask()
 if ($this->newTask->user_id) {
 $this->newTask->sendActivityActivatedNotifications();
 }
 event(new ActivityAssigned($this->newTask));
 if ($this->newTask->element_type === 'task') {
 event(new ActivityAssigned($this->newTask));
 }

 $this->addComment();
 }
Expand Down

2 changes: 2 additions & 0 deletions
config/app.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,8 @@
 env('APP_URL', 'http://localhost')
 )
 ),
 'nayra_rest_api_host' => env('NAYRA_REST_API_HOST', ''),
 'screen_task_cache_time' => env('SCREEN_TASK_CACHE_TIME', 86400),

 // Allows our script executors to ignore invalid SSL. This should only be set to false for development.
 'api_ssl_verify' => env('API_SSL_VERIFY', 'true'),
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls#6914

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

caleeli
merged 2 commits into

from

Jun 6, 2024
 Merged


FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls
#6914
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
7626508

FOUR-15871 Optimize Interstitial to Reduce Redundant Task Calls


julceslauhub Jun 6, 2024
61ca014

Merge branch 'feature/FOUR-15739' of https://github.com/ProcessMaker/…


julceslauhub Jun 6, 2024

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


11 changes: 11 additions & 0 deletions
ProcessMaker/Events/ActivityAssigned.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -60,4 +60,15 @@ public function getProcessRequestToken()
 {
 return $this->processRequestToken;
 }

 /**
 * Get data
 */
 public function getData(): array
 {
 return [
 'payloadUrl' => $this->payloadUrl,
 'element_type' => $this->processRequestToken->element_type,
 ];
 }
}

12 changes: 11 additions & 1 deletion
ProcessMaker/Events/ProcessUpdated.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -8,6 +8,7 @@
use Illuminate\Foundation\Events\Dispatchable;
use Illuminate\Queue\SerializesModels;
use ProcessMaker\Models\ProcessRequest;
use ProcessMaker\Nayra\Contracts\Bpmn\TokenInterface;

class ProcessUpdated implements ShouldBroadcastNow
{
Expand All@@ -17,19 +18,28 @@ class ProcessUpdated implements ShouldBroadcastNow

 public $event;

 public $tokenId;

 public $elementType;

 private $processRequest;

 /**
 * Create a new event instance.
 *
 * @return void
 */
 public function __construct(ProcessRequest $processRequest, $event)
 public function __construct(ProcessRequest $processRequest, $event, TokenInterface $token = null)
 {
 $this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
 $this->event = $event;

 $this->processRequest = $processRequest;

 if ($token) {
 $this->tokenId = $token->getId();
 $this->elementType = $token->element_type;
 }
 }

 /**
Expand Down

38 changes: 37 additions & 1 deletion
ProcessMaker/Jobs/ExecuteScript.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@
use ProcessMaker\Events\ScriptResponseEvent;
use ProcessMaker\Models\Script;
use ProcessMaker\Models\User;
use ProcessMaker\Nayra\Managers\WorkflowManagerRabbitMq;
use Throwable;

class ExecuteScript implements ShouldQueue
Expand DownExpand Up@@ -62,7 +63,12 @@ public function __construct(ScriptInterface $script, User $current_user, $code,
 */
 public function handle()
 {
 //throw new \Exception('This method must be overridden.');
 $useNayraDocker = !empty(config('app.nayra_rest_api_host'));
 $isPhp = strtolower($this->script->language) === 'php';
 if ($isPhp && $useNayraDocker && $this->sync) {
 return $this->handleNayraDocker();
 }

 try {
 // Just set the code but do not save the object (preview only)
 $this->script->code = $this->code;
Expand All@@ -82,6 +88,36 @@ public function handle()
 }
 }

 /**
 * Execute the script task using Nayra Docker.
 *
 * @return string|bool
 */
 public function handleNayraDocker()
 {
 $engine = new WorkflowManagerRabbitMq();
 $params = [
 'name' => uniqid('script_', true),
 'script' => $this->code,
 'data' => $this->data,
 'config' => $this->configuration,
 'envVariables' => $engine->getEnvironmentVariables(),
 ];
 $body = json_encode($params);
 $url = config('app.nayra_rest_api_host') . '/run_script';
 $ch = curl_init($url);
 curl_setopt($ch, CURLOPT_CUSTOMREQUEST, 'POST');
 curl_setopt($ch, CURLOPT_POSTFIELDS, $body);
 curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
 curl_setopt($ch, CURLOPT_HTTPHEADER, [
 'Content-Type: application/json',
 'Content-Length: ' . strlen($body),
 ]);
 $result = curl_exec($ch);
 curl_close($ch);
 return $result;
 }

 /**
 * Send a response to the user interface
 *
Expand Down

5 changes: 3 additions & 2 deletions
ProcessMaker/Listeners/BpmnSubscriber.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -126,8 +126,9 @@ public function onActivityActivated(ActivityActivatedEvent $event)
 if ($token->user_id) {
 $token->sendActivityActivatedNotifications();
 }

 event(new ActivityAssigned($event->token));
 if ($event->token->element_type === 'task') {
 event(new ActivityAssigned($event->token));
 }
 }

 /**
Expand Down

2 changes: 1 addition & 1 deletion
ProcessMaker/Managers/TaskSchedulerManager.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -144,7 +144,7 @@ public function scheduleTasks()

 $this->removeExpiredLocks();

 $tasks = ScheduledTask::all();
 $tasks = ScheduledTask::cursor();

 foreach ($tasks as $task) {
 try {
Expand Down

6 changes: 3 additions & 3 deletions
ProcessMaker/Models/ProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -888,11 +888,11 @@ public function getVersionDefinitions($forceParse = false, $engine = null)
 *
 * @param string $eventName
 */
 public function notifyProcessUpdated($eventName)
 public function notifyProcessUpdated($eventName, TokenInterface $token = null)
 {
 $event = new ProcessUpdated($this, $eventName);
 $event = new ProcessUpdated($this, $eventName, $token);
 if ($this->parentRequest) {
 $this->parentRequest->notifyProcessUpdated($eventName);
 $this->parentRequest->notifyProcessUpdated($eventName, $token);
 }
 event($event);
 }
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/Models/ProcessRequestToken.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1150,6 +1150,8 @@ public function reassign($toUserId, User $requestingUser)
 // Send a notification to the user
 $notification = new TaskReassignmentNotification($this);
 $this->user->notify($notification);
 event(new ActivityAssigned($this));
 if ($this->element_type === 'task') {
 event(new ActivityAssigned($this));
 }
 }
}

2 changes: 1 addition & 1 deletion
ProcessMaker/Nayra/Managers/WorkflowManagerRabbitMq.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -682,7 +682,7 @@ private function dispatchAction(array $action, $subject = null): void
 *
 * @return array
 */
private function getEnvironmentVariables()
public function getEnvironmentVariables()
 {
 $environmentVariables = [];
 EnvironmentVariable::chunk(50, function ($variables) use (&$environmentVariables) {
Expand Down

8 changes: 4 additions & 4 deletions
ProcessMaker/Repositories/TokenRepository.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -154,7 +154,7 @@ public function persistActivityActivated(ActivityInterface $activity, TokenInter
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED');
 $request->notifyProcessUpdated('ACTIVITY_ACTIVATED', $token);
 $this->instanceRepository->persistInstanceUpdated($token->getInstance());
 }

Expand DownExpand Up@@ -192,7 +192,7 @@ public function persistStartEventTriggered(StartEventInterface $startEvent, Coll
 $token->saveOrFail();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED');
 $request->notifyProcessUpdated('START_EVENT_TRIGGERED', $token);
 }

 private function assignTaskUser(ActivityInterface $activity, TokenInterface $token, Instance $instance)
Expand DownExpand Up@@ -224,7 +224,7 @@ public function persistActivityException(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION');
 $request->notifyProcessUpdated('ACTIVITY_EXCEPTION', $token);
 }

 /**
Expand DownExpand Up@@ -258,7 +258,7 @@ public function persistActivityCompleted(ActivityInterface $activity, TokenInter
 $token->save();
 $token->setId($token->getKey());
 $request = $token->getInstance();
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED');
 $request->notifyProcessUpdated('ACTIVITY_COMPLETED', $token);
 }

 /**
Expand Down

4 changes: 3 additions & 1 deletion
ProcessMaker/RollbackProcessRequest.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -148,7 +148,9 @@ private function rollbackToTask()
 if ($this->newTask->user_id) {
 $this->newTask->sendActivityActivatedNotifications();
 }
 event(new ActivityAssigned($this->newTask));
 if ($this->newTask->element_type === 'task') {
 event(new ActivityAssigned($this->newTask));
 }

 $this->addComment();
 }
Expand Down

2 changes: 2 additions & 0 deletions
config/app.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -99,6 +99,8 @@
 env('APP_URL', 'http://localhost')
 )
 ),
 'nayra_rest_api_host' => env('NAYRA_REST_API_HOST', ''),
 'screen_task_cache_time' => env('SCREEN_TASK_CACHE_TIME', 86400),

 // Allows our script executors to ignore invalid SSL. This should only be set to false for development.
 'api_ssl_verify' => env('API_SSL_VERIFY', 'true'),
Expand Down