From f131993947b2cfb9c20abc4e2668ea09e21b0f23 Mon Sep 17 00:00:00 2001 From: Fabio Date: Tue, 10 Dec 2024 16:49:59 -0400 Subject: [PATCH 1/3] FOUR-20534:Implement the improvements in Request and Cases --- .../Http/Controllers/CasesController.php | 45 +++++- .../casesDetail/components/CaseDetail.vue | 4 +- .../casesDetail/components/NewOverview.vue | 138 ++++++++++++++++++ .../cases/casesDetail/variables/index.js | 4 + resources/views/cases/edit.blade.php | 30 ++++ 5 files changed, 218 insertions(+), 3 deletions(-) create mode 100644 resources/jscomposition/cases/casesDetail/components/NewOverview.vue diff --git a/ProcessMaker/Http/Controllers/CasesController.php b/ProcessMaker/Http/Controllers/CasesController.php index 942c87ac95..550546fe00 100644 --- a/ProcessMaker/Http/Controllers/CasesController.php +++ b/ProcessMaker/Http/Controllers/CasesController.php @@ -10,9 +10,11 @@ use ProcessMaker\Models\Screen; use ProcessMaker\Package\PackageComments\PackageServiceProvider; use ProcessMaker\ProcessTranslations\ScreenTranslation; +use ProcessMaker\Traits\ProcessMapTrait; class CasesController extends Controller { + use ProcessMapTrait; /** * Get the list of requests. * @@ -76,6 +78,45 @@ public function show($case_number) // Get the summary screen tranlations $this->summaryScreenTranslation($request); + // Load the process map + $processRequest = ProcessRequest::find($request->id); + + $bpmn = $request->process->bpmn; + $filteredCompletedNodes = []; + $requestInProgressNodes = []; + $requestIdleNodes = []; + + if ($processRequest) { + $requestCompletedNodes = $processRequest->tokens() + ->whereIn('status', ['CLOSED', 'COMPLETED', 'TRIGGERED']) + ->pluck('element_id'); + $requestInProgressNodes = $processRequest->tokens() + ->whereIn('status', ['ACTIVE', 'INCOMING']) + ->pluck('element_id'); + // Remove any node that is 'ACTIVE' from the completed list. + $filteredCompletedNodes = $requestCompletedNodes->diff($requestInProgressNodes)->values(); + + // Obtain In-Progress nodes that were completed before + $matchingNodes = $requestInProgressNodes->intersect($requestCompletedNodes); + + // Get idle nodes. + $xml = $this->loadAndPrepareXML($bpmn); + $nodeIds = $this->getNodeIds($xml); + $requestIdleNodes = $nodeIds->diff($filteredCompletedNodes)->diff($requestInProgressNodes)->values(); + + // Add completed sequence flow to the list of completed nodes. + $sequenceFlowNodes = $this->getCompletedSequenceFlow($xml, $filteredCompletedNodes->implode(' '), $requestInProgressNodes->implode(' '), $matchingNodes->implode(' ')); + $filteredCompletedNodes = $filteredCompletedNodes->merge($sequenceFlowNodes); + } + + + $inflightData = [ + 'bpmn' => $bpmn, + 'requestCompletedNodes' => $filteredCompletedNodes, + 'requestInProgressNodes' => $requestInProgressNodes, + 'requestIdleNodes' => $requestIdleNodes, + 'requestId' => $request->process->id, + ]; // Return the view return view('cases.edit', compact( 'request', @@ -85,7 +126,9 @@ public function show($case_number) 'canViewComments', 'canPrintScreens', 'isProcessManager', - 'manager' + 'manager', + 'bpmn', + 'inflightData', )); } diff --git a/resources/jscomposition/cases/casesDetail/components/CaseDetail.vue b/resources/jscomposition/cases/casesDetail/components/CaseDetail.vue index ca952c0614..ab03e9e023 100644 --- a/resources/jscomposition/cases/casesDetail/components/CaseDetail.vue +++ b/resources/jscomposition/cases/casesDetail/components/CaseDetail.vue @@ -13,7 +13,7 @@ import RequestTable from "./RequestTable.vue"; import TabHistory from "./TabHistory.vue"; import CompletedForms from "./CompletedForms.vue"; import TabFiles from "./TabFiles.vue"; -import Overview from "./Overview.vue"; +import Overview from "./NewOverview.vue"; import TabSummary from "./TabSummary.vue"; import ErrorsTab from "./ErrorsTab.vue"; import { getRequestCount, getRequestStatus, isErrors } from "../variables/index"; @@ -67,7 +67,7 @@ const tabs = [ name: translate.t("Summary"), href: "#summary", current: "summary", - show: getRequestStatus() !== 'ERROR', + show: getRequestStatus() !== "ERROR", content: TabSummary, }, { diff --git a/resources/jscomposition/cases/casesDetail/components/NewOverview.vue b/resources/jscomposition/cases/casesDetail/components/NewOverview.vue new file mode 100644 index 0000000000..84d99310b2 --- /dev/null +++ b/resources/jscomposition/cases/casesDetail/components/NewOverview.vue @@ -0,0 +1,138 @@ + + + diff --git a/resources/jscomposition/cases/casesDetail/variables/index.js b/resources/jscomposition/cases/casesDetail/variables/index.js index 00d1a3d564..ad960a1ffb 100644 --- a/resources/jscomposition/cases/casesDetail/variables/index.js +++ b/resources/jscomposition/cases/casesDetail/variables/index.js @@ -21,3 +21,7 @@ export const getRequestCount = () => requestCount; export const getErrors = () => errorLogs; export const isErrors = () => request.status === "ERROR"; + +export const getInflightData = () => inflightData; + +export const getXML = () => inflightData.bpmn; diff --git a/resources/views/cases/edit.blade.php b/resources/views/cases/edit.blade.php index 9832c8ea9d..9058c18fa5 100644 --- a/resources/views/cases/edit.blade.php +++ b/resources/views/cases/edit.blade.php @@ -118,6 +118,16 @@ class="tw-grow tw-overflow-hidden" @endsection @section('js') + + @if (hasPackage('package-files')) From 901b61bb14615ad3aa92cebb04797c4be13fb6d4 Mon Sep 17 00:00:00 2001 From: Fabio Date: Wed, 11 Dec 2024 15:51:54 -0400 Subject: [PATCH 2/3] add to Requests --- .../Http/Controllers/RequestController.php | 43 +++++++++++++ resources/views/requests/show.blade.php | 60 +++++++++++-------- 2 files changed, 79 insertions(+), 24 deletions(-) diff --git a/ProcessMaker/Http/Controllers/RequestController.php b/ProcessMaker/Http/Controllers/RequestController.php index 91b9934bf0..69bee03b29 100644 --- a/ProcessMaker/Http/Controllers/RequestController.php +++ b/ProcessMaker/Http/Controllers/RequestController.php @@ -28,6 +28,7 @@ use ProcessMaker\ProcessTranslations\ScreenTranslation; use ProcessMaker\RetryProcessRequest; use ProcessMaker\Traits\HasControllerAddons; +use ProcessMaker\Traits\ProcessMapTrait; use ProcessMaker\Traits\SearchAutocompleteTrait; use Spatie\MediaLibrary\MediaCollections\Models\Media; @@ -35,6 +36,7 @@ class RequestController extends Controller { use SearchAutocompleteTrait; use HasControllerAddons; + use ProcessMapTrait; /** * Get the list of requests. @@ -182,6 +184,45 @@ public function show(ProcessRequest $request, Media $mediaItems) } $this->summaryScreenTranslation($request); + //Load the process map + $processRequest = ProcessRequest::find($request->id); + $bpmn = $request->process->bpmn; + $filteredCompletedNodes = []; + $requestInProgressNodes = []; + $requestIdleNodes = []; + + if ($processRequest) { + $requestCompletedNodes = $processRequest->tokens() + ->whereIn('status', ['CLOSED', 'COMPLETED', 'TRIGGERED']) + ->pluck('element_id'); + $requestInProgressNodes = $processRequest->tokens() + ->whereIn('status', ['ACTIVE', 'INCOMING']) + ->pluck('element_id'); + // Remove any node that is 'ACTIVE' from the completed list. + $filteredCompletedNodes = $requestCompletedNodes->diff($requestInProgressNodes)->values(); + + // Obtain In-Progress nodes that were completed before + $matchingNodes = $requestInProgressNodes->intersect($requestCompletedNodes); + + // Get idle nodes. + $xml = $this->loadAndPrepareXML($bpmn); + $nodeIds = $this->getNodeIds($xml); + $requestIdleNodes = $nodeIds->diff($filteredCompletedNodes)->diff($requestInProgressNodes)->values(); + + // Add completed sequence flow to the list of completed nodes. + $sequenceFlowNodes = $this->getCompletedSequenceFlow($xml, $filteredCompletedNodes->implode(' '), $requestInProgressNodes->implode(' '), $matchingNodes->implode(' ')); + $filteredCompletedNodes = $filteredCompletedNodes->merge($sequenceFlowNodes); + } + + + $inflightData = [ + 'bpmn' => $bpmn, + 'requestCompletedNodes' => $filteredCompletedNodes, + 'requestInProgressNodes' => $requestInProgressNodes, + 'requestIdleNodes' => $requestIdleNodes, + 'requestId' => $request->process->id, + ]; + if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) { return view('requests.showMobile', compact( 'request', @@ -217,6 +258,8 @@ public function show(ProcessRequest $request, Media $mediaItems) 'eligibleRollbackTask', 'errorTask', 'userConfiguration', + 'bpmn', + 'inflightData', )); } diff --git a/resources/views/requests/show.blade.php b/resources/views/requests/show.blade.php index 3df5f3402d..89bd65eadf 100644 --- a/resources/views/requests/show.blade.php +++ b/resources/views/requests/show.blade.php @@ -235,32 +235,12 @@ class="tab-pane card card-body border-top-0 p-3">
-
+

{{ __(':name In-Flight Map', ['name' => $request->process->name]) }}

-
- -
-
- - -

- {{ __('Content not available. Check settings or try a different device.') }} -

- -
+
@@ -484,7 +464,16 @@ class="btn btn-outline-info btn-block" @foreach ($manager->getScripts() as $script) @endforeach - + + @if (hasPackage('package-files')) @@ -529,7 +518,7 @@ class="btn btn-outline-info btn-block" packages: [], processId: @json($request->process->id), canViewComments: @json($canViewComments), - isObjectLoading: false, + isObjectLoading: true, showTree: false, showInfo: true, showMenu: true, @@ -900,6 +889,23 @@ classStatusCard() { }, }); + @endsection @section('css') @@ -962,5 +968,11 @@ classStatusCard() { .menu-tab-content { margin-left: -16px; } + .main-paper { + position: static !important; + } + .card-height { + height: 50vh; + } @endsection From 50b32df08e601a1f00685273450a562f65f46de4 Mon Sep 17 00:00:00 2001 From: Fabio Date: Thu, 12 Dec 2024 11:07:00 -0400 Subject: [PATCH 3/3] CR --- .../Http/Controllers/CasesController.php | 40 +----------------- .../Http/Controllers/RequestController.php | 39 +---------------- ProcessMaker/Traits/ProcessMapTrait.php | 42 +++++++++++++++++++ .../casesDetail/components/NewOverview.vue | 1 - 4 files changed, 46 insertions(+), 76 deletions(-) diff --git a/ProcessMaker/Http/Controllers/CasesController.php b/ProcessMaker/Http/Controllers/CasesController.php index 550546fe00..c0476d984f 100644 --- a/ProcessMaker/Http/Controllers/CasesController.php +++ b/ProcessMaker/Http/Controllers/CasesController.php @@ -79,44 +79,8 @@ public function show($case_number) $this->summaryScreenTranslation($request); // Load the process map - $processRequest = ProcessRequest::find($request->id); - - $bpmn = $request->process->bpmn; - $filteredCompletedNodes = []; - $requestInProgressNodes = []; - $requestIdleNodes = []; - - if ($processRequest) { - $requestCompletedNodes = $processRequest->tokens() - ->whereIn('status', ['CLOSED', 'COMPLETED', 'TRIGGERED']) - ->pluck('element_id'); - $requestInProgressNodes = $processRequest->tokens() - ->whereIn('status', ['ACTIVE', 'INCOMING']) - ->pluck('element_id'); - // Remove any node that is 'ACTIVE' from the completed list. - $filteredCompletedNodes = $requestCompletedNodes->diff($requestInProgressNodes)->values(); - - // Obtain In-Progress nodes that were completed before - $matchingNodes = $requestInProgressNodes->intersect($requestCompletedNodes); - - // Get idle nodes. - $xml = $this->loadAndPrepareXML($bpmn); - $nodeIds = $this->getNodeIds($xml); - $requestIdleNodes = $nodeIds->diff($filteredCompletedNodes)->diff($requestInProgressNodes)->values(); - - // Add completed sequence flow to the list of completed nodes. - $sequenceFlowNodes = $this->getCompletedSequenceFlow($xml, $filteredCompletedNodes->implode(' '), $requestInProgressNodes->implode(' '), $matchingNodes->implode(' ')); - $filteredCompletedNodes = $filteredCompletedNodes->merge($sequenceFlowNodes); - } - - - $inflightData = [ - 'bpmn' => $bpmn, - 'requestCompletedNodes' => $filteredCompletedNodes, - 'requestInProgressNodes' => $requestInProgressNodes, - 'requestIdleNodes' => $requestIdleNodes, - 'requestId' => $request->process->id, - ]; + $inflightData = $this->loadProcessMap($request); + $bpmn = $inflightData['bpmn']; // Return the view return view('cases.edit', compact( 'request', diff --git a/ProcessMaker/Http/Controllers/RequestController.php b/ProcessMaker/Http/Controllers/RequestController.php index 69bee03b29..0d55426666 100644 --- a/ProcessMaker/Http/Controllers/RequestController.php +++ b/ProcessMaker/Http/Controllers/RequestController.php @@ -185,43 +185,8 @@ public function show(ProcessRequest $request, Media $mediaItems) $this->summaryScreenTranslation($request); //Load the process map - $processRequest = ProcessRequest::find($request->id); - $bpmn = $request->process->bpmn; - $filteredCompletedNodes = []; - $requestInProgressNodes = []; - $requestIdleNodes = []; - - if ($processRequest) { - $requestCompletedNodes = $processRequest->tokens() - ->whereIn('status', ['CLOSED', 'COMPLETED', 'TRIGGERED']) - ->pluck('element_id'); - $requestInProgressNodes = $processRequest->tokens() - ->whereIn('status', ['ACTIVE', 'INCOMING']) - ->pluck('element_id'); - // Remove any node that is 'ACTIVE' from the completed list. - $filteredCompletedNodes = $requestCompletedNodes->diff($requestInProgressNodes)->values(); - - // Obtain In-Progress nodes that were completed before - $matchingNodes = $requestInProgressNodes->intersect($requestCompletedNodes); - - // Get idle nodes. - $xml = $this->loadAndPrepareXML($bpmn); - $nodeIds = $this->getNodeIds($xml); - $requestIdleNodes = $nodeIds->diff($filteredCompletedNodes)->diff($requestInProgressNodes)->values(); - - // Add completed sequence flow to the list of completed nodes. - $sequenceFlowNodes = $this->getCompletedSequenceFlow($xml, $filteredCompletedNodes->implode(' '), $requestInProgressNodes->implode(' '), $matchingNodes->implode(' ')); - $filteredCompletedNodes = $filteredCompletedNodes->merge($sequenceFlowNodes); - } - - - $inflightData = [ - 'bpmn' => $bpmn, - 'requestCompletedNodes' => $filteredCompletedNodes, - 'requestInProgressNodes' => $requestInProgressNodes, - 'requestIdleNodes' => $requestIdleNodes, - 'requestId' => $request->process->id, - ]; + $inflightData = $this->loadProcessMap($request); + $bpmn = $inflightData['bpmn']; if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) { return view('requests.showMobile', compact( diff --git a/ProcessMaker/Traits/ProcessMapTrait.php b/ProcessMaker/Traits/ProcessMapTrait.php index baac236a67..d38260a8f9 100644 --- a/ProcessMaker/Traits/ProcessMapTrait.php +++ b/ProcessMaker/Traits/ProcessMapTrait.php @@ -3,6 +3,7 @@ namespace ProcessMaker\Traits; use Illuminate\Support\Collection; +use ProcessMaker\Bpmn\Process; use ProcessMaker\Models\ProcessRequest; use SimpleXMLElement; @@ -108,4 +109,45 @@ private function getCountFlag(int $sourceCount, int $targetCount, string $source return $maxToken->status === 'ACTIVE' && $sourceCount === $targetCount; } + + private function loadProcessMap(ProcessRequest $request): array + { + $processRequest = ProcessRequest::find($request->id); + $bpmn = $request->process->bpmn; + $filteredCompletedNodes = []; + $requestInProgressNodes = []; + $requestIdleNodes = []; + + if ($processRequest) { + $requestCompletedNodes = $processRequest->tokens() + ->whereIn('status', ['CLOSED', 'COMPLETED', 'TRIGGERED']) + ->pluck('element_id'); + $requestInProgressNodes = $processRequest->tokens() + ->whereIn('status', ['ACTIVE', 'INCOMING']) + ->pluck('element_id'); + + // Remove any node that is 'ACTIVE' from the completed list. + $filteredCompletedNodes = $requestCompletedNodes->diff($requestInProgressNodes)->values(); + + // Obtain In-Progress nodes that were completed before + $matchingNodes = $requestInProgressNodes->intersect($requestCompletedNodes); + + // Get idle nodes. + $xml = $this->loadAndPrepareXML($bpmn); + $nodeIds = $this->getNodeIds($xml); + $requestIdleNodes = $nodeIds->diff($filteredCompletedNodes)->diff($requestInProgressNodes)->values(); + + // Add completed sequence flow to the list of completed nodes. + $sequenceFlowNodes = $this->getCompletedSequenceFlow($xml, $filteredCompletedNodes->implode(' '), $requestInProgressNodes->implode(' '), $matchingNodes->implode(' ')); + $filteredCompletedNodes = $filteredCompletedNodes->merge($sequenceFlowNodes); + } + + return [ + 'bpmn' => $bpmn, + 'requestCompletedNodes' => $filteredCompletedNodes, + 'requestInProgressNodes' => $requestInProgressNodes, + 'requestIdleNodes' => $requestIdleNodes, + 'requestId' => $request->process->id, + ]; + } } diff --git a/resources/jscomposition/cases/casesDetail/components/NewOverview.vue b/resources/jscomposition/cases/casesDetail/components/NewOverview.vue index 84d99310b2..eda604152b 100644 --- a/resources/jscomposition/cases/casesDetail/components/NewOverview.vue +++ b/resources/jscomposition/cases/casesDetail/components/NewOverview.vue @@ -129,7 +129,6 @@ onMounted(() => { }); onBeforeUnmount(() => { - console.log("unmounted"); ProcessMaker.$modeler = null; modelerRef.value?.$destroy(); modelerRef.value = null;