Uh oh!
There was an error while loading. Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork 249
FOUR-15854 on task completed - override behavior#6875
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.
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
Uh oh!
There was an error while loading. Please reload this page.
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
6385995
feat: add element destination attribute to process request token mode…
devmiguelangel b438c67
fix(sq): fix code smell
devmiguelangel 478ca10
feat: add element destination for custom dashboard and external url b…
devmiguelangel 105c797
fix(cr): improve code
devmiguelangel 996ae52
add translation labels
rodriquelca File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Jump to
Jump to file
Failed to load files.
Loading
Uh oh!
There was an error while loading. Please reload this page.
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -4,6 +4,7 @@ | ||
| use Carbon\Carbon; | ||
| use DB; | ||
| use Exception; | ||
| use Illuminate\Auth\Access\AuthorizationException; | ||
| use Illuminate\Support\Arr; | ||
| use Illuminate\Support\Facades\Notification; | ||
| @@ -135,6 +136,7 @@ class ProcessRequestToken extends ProcessMakerModel implements TokenInterface | ||
| */ | ||
| protected $appends = [ | ||
| 'advanceStatus', | ||
| 'elementDestination' | ||
| ]; | ||
| /** | ||
| @@ -287,28 +289,63 @@ public function assignableUsers() | ||
| } | ||
| /** | ||
| * Get the BPMN definition of the element where the token is. | ||
| * Returns either the owner element or its properties | ||
| * | ||
| * @return array|\ProcessMaker\Nayra\Contracts\Bpmn\EntityInterface | ||
| * @param asObject Boolean flag that determines whether the function should return the element directly or its | ||
| * properties as an object. | ||
| * | ||
| * @return If the parameter is true, the function will return the object. If is false, the | ||
| * function will return the properties of the object. | ||
| */ | ||
| public function getDefinition($asObject = false, $par = null) | ||
| private function getDefinitionFromOwner($asObject) | ||
| { | ||
| if ($this->getOwner() && $this->getOwnerElement()) { | ||
| $element = $this->getOwnerElement(); | ||
| $element = $this->getOwnerElement(); | ||
| return $asObject ? $element : $element->getProperties(); | ||
| } | ||
| return $asObject ? $element : $element->getProperties(); | ||
| } | ||
| /** | ||
| * Retrieves a specific element's BPMN definition from a request object and returns either the element | ||
| * itself or its properties. | ||
| * | ||
| * @param asObject Boolean flag that determines whether the function should return the BPMN element instance | ||
| * as an object or just its properties. | ||
| * | ||
| * @return If `asObject` is false, the properties of the BPMN element instance are returned. | ||
| */ | ||
| private function getDefinitionFromRequest($asObject) | ||
devmiguelangel marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| { | ||
| $request = $this->processRequest ?: $this->getInstance(); | ||
| if (!$request) { | ||
| return []; | ||
| } | ||
| $process = $request->processVersion ?: $request->process; | ||
| $definitions = $process->getDefinitions(); | ||
| $element = $definitions->findElementById($this->element_id); | ||
| if (!$element) { | ||
| return []; | ||
| } | ||
| return $asObject ? $element->getBpmnElementInstance() : $element->getBpmnElementInstance()->getProperties(); | ||
| } | ||
| /** | ||
| * Get the BPMN definition of the element where the token is. | ||
| * | ||
| * @return array|\ProcessMaker\Nayra\Contracts\Bpmn\EntityInterface | ||
| */ | ||
| public function getDefinition($asObject = false, $par = null) | ||
| { | ||
| if ($this->getOwner() && $this->getOwnerElement()) { | ||
| return $this->getDefinitionFromOwner($asObject); | ||
| } | ||
| return $this->getDefinitionFromRequest($asObject); | ||
| } | ||
| /** | ||
| * Get the BPMN element node where the token is currently located. | ||
| * | ||
| @@ -1152,4 +1189,71 @@ public function reassign($toUserId, User $requestingUser) | ||
| $this->user->notify($notification); | ||
| event(new ActivityAssigned($this)); | ||
| } | ||
| private function getElementDestination($elementDestinationType, $elementDestinationProp) | ||
| { | ||
| $elementDestination = null; | ||
| switch ($elementDestinationType) { | ||
devmiguelangel marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| case 'customDashboard': | ||
| case 'externalURL': | ||
| if (array_key_exists('value', $elementDestinationProp)) { | ||
| if (is_string($elementDestinationProp['value'])) { | ||
| $elementDestination = $elementDestinationProp['value']; | ||
| } else { | ||
| $elementDestination = $elementDestinationProp['value']['url'] ?? null; | ||
| } | ||
| } | ||
| break; | ||
| case 'taskList': | ||
| $elementDestination = route('tasks.index'); | ||
| break; | ||
| case 'homepageDashboard': | ||
| if (hasPackage('package-dynamic-ui')) { | ||
devmiguelangel marked this conversation as resolved.
Uh oh!There was an error while loading. Please reload this page. | ||
| $user = auth()->user(); | ||
| $elementDestination = \ProcessMaker\Package\PackageDynamicUI\Models\DynamicUI::getHomePage($user); | ||
| } else { | ||
| $elementDestination = route('home'); | ||
| } | ||
| break; | ||
| case 'processLaunchpad': | ||
| $elementDestination = route('process.browser.index', [ | ||
| 'process' => $this->process_id, | ||
| 'categorySelected' => -1 | ||
| ]); | ||
| break; | ||
| case 'taskSource': | ||
| $elementDestination = $elementDestinationType; | ||
| break; | ||
| default: | ||
| $elementDestination = null; | ||
| break; | ||
| } | ||
| return $elementDestination; | ||
| } | ||
| /** | ||
| * Determines the destination URL based on the element destination type specified in the definition. | ||
| * | ||
| * @return string|null | ||
| */ | ||
| public function getElementDestinationAttribute(): ?string | ||
| { | ||
| $definition = $this->getDefinition(); | ||
| $elementDestinationProp = $definition['elementDestination'] ?? null; | ||
| $elementDestinationType = null; | ||
| try { | ||
| $elementDestinationProp = json_decode($elementDestinationProp, true); | ||
| if (is_array($elementDestinationProp) && array_key_exists('type', $elementDestinationProp)) { | ||
| $elementDestinationType = $elementDestinationProp['type']; | ||
| } | ||
| } catch (Exception $e) { | ||
| return null; | ||
| } | ||
| return $this->getElementDestination($elementDestinationType, $elementDestinationProp); | ||
| } | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Uh oh!
There was an error while loading. Please reload this page.
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.