FOUR-20534: Implement the perfomance In-flight in Request and Cases#7816

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
pmPaulis merged 3 commits into from
Dec 12, 2024
Merged

FOUR-20534: Implement the perfomance In-flight in Request and Cases #7816

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f131993
FOUR-20534:Implement the improvements in Request and Cases
fagubla Dec 10, 2024
901b61b
add to Requests
fagubla Dec 11, 2024
50b32df
CR
fagubla Dec 12, 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
9 changes: 8 additions & 1 deletion ProcessMaker/Http/Controllers/CasesController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
*
Expand DownExpand Up@@ -76,6 +78,9 @@ public function show($case_number)
// Get the summary screen tranlations
$this->summaryScreenTranslation($request);

// Load the process map
$inflightData = $this->loadProcessMap($request);
$bpmn = $inflightData['bpmn'];
// Return the view
return view('cases.edit', compact(
'request',
Expand All@@ -85,7 +90,9 @@ public function show($case_number)
'canViewComments',
'canPrintScreens',
'isProcessManager',
'manager'
'manager',
'bpmn',
'inflightData',
));
}

Expand Down
8 changes: 8 additions & 0 deletions ProcessMaker/Http/Controllers/RequestController.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,15 @@
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;

class RequestController extends Controller
{
use SearchAutocompleteTrait;
use HasControllerAddons;
use ProcessMapTrait;

/**
* Get the list of requests.
Expand DownExpand Up@@ -182,6 +184,10 @@ public function show(ProcessRequest $request, Media $mediaItems)
}
$this->summaryScreenTranslation($request);

//Load the process map
$inflightData = $this->loadProcessMap($request);
$bpmn = $inflightData['bpmn'];

if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) {
return view('requests.showMobile', compact(
'request',
Expand DownExpand Up@@ -217,6 +223,8 @@ public function show(ProcessRequest $request, Media $mediaItems)
'eligibleRollbackTask',
'errorTask',
'userConfiguration',
'bpmn',
'inflightData',
));
}

Expand Down
42 changes: 42 additions & 0 deletions ProcessMaker/Traits/ProcessMapTrait.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Traits;

use Illuminate\Support\Collection;
use ProcessMaker\Bpmn\Process;
use ProcessMaker\Models\ProcessRequest;
use SimpleXMLElement;

Expand DownExpand Up@@ -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,
];
}
}
4 changes: 2 additions & 2 deletions resources/jscomposition/cases/casesDetail/components/CaseDetail.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -67,7 +67,7 @@ const tabs = [
name: translate.t("Summary"),
href: "#summary",
current: "summary",
show: getRequestStatus() !== 'ERROR',
show: getRequestStatus() !== "ERROR",
content: TabSummary,
},
{
Expand Down
137 changes: 137 additions & 0 deletions resources/jscomposition/cases/casesDetail/components/NewOverview.vue
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
<template>
<div
class="tw-w-full tw-h-full tw-overflow-hidden tw-relative"
data-test="body-container"
>
<ProcessMapTooltip
v-show="showTooltip"
ref="tooltipRef"
:enabled="enableTooltip"
:node-id="tooltip.nodeId"
:node-name="tooltip.nodeName"
:request-id="inflightData.requestId"
:style="{
left: `${tooltip.newX}px`,
top: `${tooltip.newY}px`
}"
@is-loading="isTooltipLoading"
/>
<transition
name="fade"
mode="in-out"
>
<Modeler
ref="modelerRef"
:key="keyModeler"
:decorations="decorations"
:request-completed-nodes="inflightData.requestCompletedNodes"
:request-in-progress-nodes="inflightData.requestInProgressNodes"
:request-idle-nodes="inflightData.requestIdleNodes"
:read-only="true"
@set-xml-manager="xmlManager = $event"
@click="handleClick"
/>
</transition>
</div>
</template>

<script setup>
import {
ref, watchEffect, onMounted, computed, nextTick, onBeforeUnmount,
} from "vue";
import { Modeler } from "@processmaker/modeler";
import ProcessMapTooltip from "../../../../js/processes/modeler/components/ProcessMapTooltip.vue";
import { getInflightData } from "../variables";

const keyModeler = ref(Math.random());
const modelerRef = ref("");
const tooltipRef = ref(null);
const enableTooltip = ref(true);
const decorations = ref({
borderOutline: {},
});
const xmlManager = ref();
const tooltip = ref({
isActive: false,
isLoading: false,
nodeId: null,
nodeName: null,
allowedNodes: [
"bpmn:Task",
"bpmn:ManualTask",
"bpmn:SequenceFlow",
"bpmn:ScriptTask",
"bpmn:CallActivity",
"bpmn:ServiceTask",
],
coordinates: { x: 0, y: 0 },
newX: 0,
newY: 0,
});
const inflightData = ref(getInflightData());

const isMappingActive = computed(() => (window.ProcessMaker.modeler.enableProcessMapping !== undefined
? window.ProcessMaker.modeler.enableProcessMapping
: true));

const showTooltip = computed(() => enableTooltip.value && tooltip.value.isActive);

const calculateTooltipPosition = () => {
const rectTooltip = tooltipRef.value.$el.getBoundingClientRect();
tooltip.value.newY = tooltip.value.coordinates.y - rectTooltip.height - 20;
if (tooltip.value.newY <= 0) {
tooltip.value.newY = 10;
}
tooltip.value.newX = tooltip.value.coordinates.x - (rectTooltip.width / 2);
if (tooltip.value.newX < 0) {
tooltip.value.newX = 0;
} else if (tooltip.value.newX + rectTooltip.width > window.innerWidth) {
tooltip.value.newX = window.innerWidth - rectTooltip.width;
}
};

const setupTooltip = ({ event, node }) => {
const isNodeTooltipAllowed = tooltip.value.allowedNodes.includes(node.$type);
if ((isNodeTooltipAllowed && !tooltip.value.isActive)
|| (isNodeTooltipAllowed && tooltip.value.nodeId !== node.id)) {
tooltip.value.nodeId = node.id;
tooltip.value.nodeName = node.name;
tooltip.value.isActive = true;
nextTick(() => {
tooltip.value.coordinates = { x: event.clientX, y: event.clientY };
calculateTooltipPosition();
});
} else if (tooltip.value.nodeId === node.id && tooltip.value.isActive) {
tooltip.value.isActive = false;
}
};

const isTooltipLoading = (value) => {
tooltip.value.isLoading = value;
};

const handleClick = (payload) => {
if (isMappingActive.value) {
setupTooltip(payload);
}
};

watchEffect(() => {
if (!tooltip.value.isLoading) {
nextTick(() => {
calculateTooltipPosition();
});
}
});

onMounted(() => {
ProcessMaker.$modeler = modelerRef.value;
});

onBeforeUnmount(() => {
ProcessMaker.$modeler = null;
modelerRef.value?.$destroy();
modelerRef.value = null;
tooltipRef.value = null;
});
</script>
4 changes: 4 additions & 0 deletions resources/jscomposition/cases/casesDetail/variables/index.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -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;
30 changes: 30 additions & 0 deletions resources/views/cases/edit.blade.php
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,16 @@ class="tw-grow tw-overflow-hidden"
@endsection

@section('js')
<script src="{{ mix('js/processes/modeler/initialLoad.js') }}"></script>
<script>
window.ProcessMaker.packages = @json(\App::make(ProcessMaker\Managers\PackageManager::class)->listPackages());
window.Processmaker = {
csrfToken: "{{csrf_token()}}",
userId: "{{\Auth::user()->id}}",
messages: [],
apiTimeout: {{config('app.api_timeout')}}
};
</script>
<script>
const data = @json($request->getRequestData());
const requestId = @json($request->getKey());
Expand All@@ -129,6 +139,26 @@ class="tw-grow tw-overflow-hidden"
const canViewComments = @json($canViewComments);
const comentable_type = @json(get_class($request));
const requestCount = @json($requestCount);
const inflightData = @json($inflightData);

window.ProcessMaker.modeler = {
xml: @json($bpmn),
configurables: [],
requestCompletedNodes: inflightData.requestCompletedNodes,
requestInProgressNodes: inflightData.requestInProgressNodes,
requestIdleNodes: inflightData.requestIdleNodes,
requestId: inflightData.requestId,
}

window.ProcessMaker.EventBus.$on('modeler-start', ({
loadXML
}) => {
loadXML(window.ProcessMaker.modeler.xml);
});

window.PM4ConfigOverrides = {
requestFiles: @json($request->requestFiles())
};
</script>

@if (hasPackage('package-files'))
Expand Down
Loading
, '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-20534: Implement the perfomance In-flight in Request and Cases#7816

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

pmPaulis
merged 3 commits into

from

Dec 12, 2024
 Merged


FOUR-20534: Implement the perfomance In-flight in Request and Cases
#7816
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f131993

FOUR-20534:Implement the improvements in Request and Cases


fagubla Dec 10, 2024
901b61b

add to Requests


fagubla Dec 11, 2024
50b32df

CR


fagubla Dec 12, 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


9 changes: 8 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 *
Expand DownExpand Up@@ -76,6 +78,9 @@ public function show($case_number)
 // Get the summary screen tranlations
 $this->summaryScreenTranslation($request);

 // Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];
 // Return the view
 return view('cases.edit', compact(
 'request',
Expand All@@ -85,7 +90,9 @@ public function show($case_number)
 'canViewComments',
 'canPrintScreens',
 'isProcessManager',
 'manager'
 'manager',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

8 changes: 8 additions & 0 deletions
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,15 @@
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;

class RequestController extends Controller
{
 use SearchAutocompleteTrait;
 use HasControllerAddons;
 use ProcessMapTrait;

 /**
 * Get the list of requests.
Expand DownExpand Up@@ -182,6 +184,10 @@ public function show(ProcessRequest $request, Media $mediaItems)
 }
 $this->summaryScreenTranslation($request);

 //Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];

 if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) {
 return view('requests.showMobile', compact(
 'request',
Expand DownExpand Up@@ -217,6 +223,8 @@ public function show(ProcessRequest $request, Media $mediaItems)
 'eligibleRollbackTask',
 'errorTask',
 'userConfiguration',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

42 changes: 42 additions & 0 deletions
ProcessMaker/Traits/ProcessMapTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Traits;

use Illuminate\Support\Collection;
use ProcessMaker\Bpmn\Process;
use ProcessMaker\Models\ProcessRequest;
use SimpleXMLElement;

Expand DownExpand Up@@ -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,
 ];
 }
}

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -67,7 +67,7 @@ const tabs = [
 name: translate.t("Summary"),
 href: "#summary",
 current: "summary",
 show: getRequestStatus() !== 'ERROR',
 show: getRequestStatus() !== "ERROR",
 content: TabSummary,
 },
 {
Expand Down

137 changes: 137 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/NewOverview.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
<template>
 <div
 class="tw-w-full tw-h-full tw-overflow-hidden tw-relative"
 data-test="body-container"
 >
 <ProcessMapTooltip
 v-show="showTooltip"
 ref="tooltipRef"
 :enabled="enableTooltip"
 :node-id="tooltip.nodeId"
 :node-name="tooltip.nodeName"
 :request-id="inflightData.requestId"
 :style="{
 left: `${tooltip.newX}px`,
 top: `${tooltip.newY}px`
 }"
 @is-loading="isTooltipLoading"
 />
 <transition
 name="fade"
 mode="in-out"
 >
 <Modeler
 ref="modelerRef"
 :key="keyModeler"
 :decorations="decorations"
 :request-completed-nodes="inflightData.requestCompletedNodes"
 :request-in-progress-nodes="inflightData.requestInProgressNodes"
 :request-idle-nodes="inflightData.requestIdleNodes"
 :read-only="true"
 @set-xml-manager="xmlManager = $event"
 @click="handleClick"
 />
 </transition>
 </div>
</template>

<script setup>
import {
 ref, watchEffect, onMounted, computed, nextTick, onBeforeUnmount,
} from "vue";
import { Modeler } from "@processmaker/modeler";
import ProcessMapTooltip from "../../../../js/processes/modeler/components/ProcessMapTooltip.vue";
import { getInflightData } from "../variables";

const keyModeler = ref(Math.random());
const modelerRef = ref("");
const tooltipRef = ref(null);
const enableTooltip = ref(true);
const decorations = ref({
 borderOutline: {},
});
const xmlManager = ref();
const tooltip = ref({
 isActive: false,
 isLoading: false,
 nodeId: null,
 nodeName: null,
 allowedNodes: [
 "bpmn:Task",
 "bpmn:ManualTask",
 "bpmn:SequenceFlow",
 "bpmn:ScriptTask",
 "bpmn:CallActivity",
 "bpmn:ServiceTask",
 ],
 coordinates: { x: 0, y: 0 },
 newX: 0,
 newY: 0,
});
const inflightData = ref(getInflightData());

const isMappingActive = computed(() => (window.ProcessMaker.modeler.enableProcessMapping !== undefined
 ? window.ProcessMaker.modeler.enableProcessMapping
 : true));

const showTooltip = computed(() => enableTooltip.value && tooltip.value.isActive);

const calculateTooltipPosition = () => {
 const rectTooltip = tooltipRef.value.$el.getBoundingClientRect();
 tooltip.value.newY = tooltip.value.coordinates.y - rectTooltip.height - 20;
 if (tooltip.value.newY <= 0) {
 tooltip.value.newY = 10;
 }
 tooltip.value.newX = tooltip.value.coordinates.x - (rectTooltip.width / 2);
 if (tooltip.value.newX < 0) {
 tooltip.value.newX = 0;
 } else if (tooltip.value.newX + rectTooltip.width > window.innerWidth) {
 tooltip.value.newX = window.innerWidth - rectTooltip.width;
 }
};

const setupTooltip = ({ event, node }) => {
 const isNodeTooltipAllowed = tooltip.value.allowedNodes.includes(node.$type);
 if ((isNodeTooltipAllowed && !tooltip.value.isActive)
 || (isNodeTooltipAllowed && tooltip.value.nodeId !== node.id)) {
 tooltip.value.nodeId = node.id;
 tooltip.value.nodeName = node.name;
 tooltip.value.isActive = true;
 nextTick(() => {
 tooltip.value.coordinates = { x: event.clientX, y: event.clientY };
 calculateTooltipPosition();
 });
 } else if (tooltip.value.nodeId === node.id && tooltip.value.isActive) {
 tooltip.value.isActive = false;
 }
};

const isTooltipLoading = (value) => {
 tooltip.value.isLoading = value;
};

const handleClick = (payload) => {
 if (isMappingActive.value) {
 setupTooltip(payload);
 }
};

watchEffect(() => {
 if (!tooltip.value.isLoading) {
 nextTick(() => {
 calculateTooltipPosition();
 });
 }
});

onMounted(() => {
 ProcessMaker.$modeler = modelerRef.value;
});

onBeforeUnmount(() => {
 ProcessMaker.$modeler = null;
 modelerRef.value?.$destroy();
 modelerRef.value = null;
 tooltipRef.value = null;
});
</script>

4 changes: 4 additions & 0 deletions
resources/jscomposition/cases/casesDetail/variables/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

30 changes: 30 additions & 0 deletions
resources/views/cases/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,16 @@ class="tw-grow tw-overflow-hidden"
@endsection

@section('js')
<script src="{{ mix('js/processes/modeler/initialLoad.js') }}"></script>
<script>
 window.ProcessMaker.packages = @json(\App::make(ProcessMaker\Managers\PackageManager::class)->listPackages());
 window.Processmaker = {
 csrfToken: "{{csrf_token()}}",
 userId: "{{\Auth::user()->id}}",
 messages: [],
 apiTimeout: {{config('app.api_timeout')}}
 };
</script>
 <script>
 const data = @json($request->getRequestData());
 const requestId = @json($request->getKey());
Expand All@@ -129,6 +139,26 @@ class="tw-grow tw-overflow-hidden"
 const canViewComments = @json($canViewComments);
 const comentable_type = @json(get_class($request));
 const requestCount = @json($requestCount);
 const inflightData = @json($inflightData);

 window.ProcessMaker.modeler = {
 xml: @json($bpmn),
 configurables: [],
 requestCompletedNodes: inflightData.requestCompletedNodes,
 requestInProgressNodes: inflightData.requestInProgressNodes,
 requestIdleNodes: inflightData.requestIdleNodes,
 requestId: inflightData.requestId,
 }

 window.ProcessMaker.EventBus.$on('modeler-start', ({
 loadXML
 }) => {
 loadXML(window.ProcessMaker.modeler.xml);
 });

 window.PM4ConfigOverrides = {
 requestFiles: @json($request->requestFiles())
 };
 </script>

 @if (hasPackage('package-files'))
Expand Down
Loading

, '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-20534: Implement the perfomance In-flight in Request and Cases#7816

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

pmPaulis
merged 3 commits into

from

Dec 12, 2024
 Merged


FOUR-20534: Implement the perfomance In-flight in Request and Cases
#7816
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f131993

FOUR-20534:Implement the improvements in Request and Cases


fagubla Dec 10, 2024
901b61b

add to Requests


fagubla Dec 11, 2024
50b32df

CR


fagubla Dec 12, 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


9 changes: 8 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 *
Expand DownExpand Up@@ -76,6 +78,9 @@ public function show($case_number)
 // Get the summary screen tranlations
 $this->summaryScreenTranslation($request);

 // Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];
 // Return the view
 return view('cases.edit', compact(
 'request',
Expand All@@ -85,7 +90,9 @@ public function show($case_number)
 'canViewComments',
 'canPrintScreens',
 'isProcessManager',
 'manager'
 'manager',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

8 changes: 8 additions & 0 deletions
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,15 @@
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;

class RequestController extends Controller
{
 use SearchAutocompleteTrait;
 use HasControllerAddons;
 use ProcessMapTrait;

 /**
 * Get the list of requests.
Expand DownExpand Up@@ -182,6 +184,10 @@ public function show(ProcessRequest $request, Media $mediaItems)
 }
 $this->summaryScreenTranslation($request);

 //Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];

 if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) {
 return view('requests.showMobile', compact(
 'request',
Expand DownExpand Up@@ -217,6 +223,8 @@ public function show(ProcessRequest $request, Media $mediaItems)
 'eligibleRollbackTask',
 'errorTask',
 'userConfiguration',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

42 changes: 42 additions & 0 deletions
ProcessMaker/Traits/ProcessMapTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Traits;

use Illuminate\Support\Collection;
use ProcessMaker\Bpmn\Process;
use ProcessMaker\Models\ProcessRequest;
use SimpleXMLElement;

Expand DownExpand Up@@ -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,
 ];
 }
}

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -67,7 +67,7 @@ const tabs = [
 name: translate.t("Summary"),
 href: "#summary",
 current: "summary",
 show: getRequestStatus() !== 'ERROR',
 show: getRequestStatus() !== "ERROR",
 content: TabSummary,
 },
 {
Expand Down

137 changes: 137 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/NewOverview.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
<template>
 <div
 class="tw-w-full tw-h-full tw-overflow-hidden tw-relative"
 data-test="body-container"
 >
 <ProcessMapTooltip
 v-show="showTooltip"
 ref="tooltipRef"
 :enabled="enableTooltip"
 :node-id="tooltip.nodeId"
 :node-name="tooltip.nodeName"
 :request-id="inflightData.requestId"
 :style="{
 left: `${tooltip.newX}px`,
 top: `${tooltip.newY}px`
 }"
 @is-loading="isTooltipLoading"
 />
 <transition
 name="fade"
 mode="in-out"
 >
 <Modeler
 ref="modelerRef"
 :key="keyModeler"
 :decorations="decorations"
 :request-completed-nodes="inflightData.requestCompletedNodes"
 :request-in-progress-nodes="inflightData.requestInProgressNodes"
 :request-idle-nodes="inflightData.requestIdleNodes"
 :read-only="true"
 @set-xml-manager="xmlManager = $event"
 @click="handleClick"
 />
 </transition>
 </div>
</template>

<script setup>
import {
 ref, watchEffect, onMounted, computed, nextTick, onBeforeUnmount,
} from "vue";
import { Modeler } from "@processmaker/modeler";
import ProcessMapTooltip from "../../../../js/processes/modeler/components/ProcessMapTooltip.vue";
import { getInflightData } from "../variables";

const keyModeler = ref(Math.random());
const modelerRef = ref("");
const tooltipRef = ref(null);
const enableTooltip = ref(true);
const decorations = ref({
 borderOutline: {},
});
const xmlManager = ref();
const tooltip = ref({
 isActive: false,
 isLoading: false,
 nodeId: null,
 nodeName: null,
 allowedNodes: [
 "bpmn:Task",
 "bpmn:ManualTask",
 "bpmn:SequenceFlow",
 "bpmn:ScriptTask",
 "bpmn:CallActivity",
 "bpmn:ServiceTask",
 ],
 coordinates: { x: 0, y: 0 },
 newX: 0,
 newY: 0,
});
const inflightData = ref(getInflightData());

const isMappingActive = computed(() => (window.ProcessMaker.modeler.enableProcessMapping !== undefined
 ? window.ProcessMaker.modeler.enableProcessMapping
 : true));

const showTooltip = computed(() => enableTooltip.value && tooltip.value.isActive);

const calculateTooltipPosition = () => {
 const rectTooltip = tooltipRef.value.$el.getBoundingClientRect();
 tooltip.value.newY = tooltip.value.coordinates.y - rectTooltip.height - 20;
 if (tooltip.value.newY <= 0) {
 tooltip.value.newY = 10;
 }
 tooltip.value.newX = tooltip.value.coordinates.x - (rectTooltip.width / 2);
 if (tooltip.value.newX < 0) {
 tooltip.value.newX = 0;
 } else if (tooltip.value.newX + rectTooltip.width > window.innerWidth) {
 tooltip.value.newX = window.innerWidth - rectTooltip.width;
 }
};

const setupTooltip = ({ event, node }) => {
 const isNodeTooltipAllowed = tooltip.value.allowedNodes.includes(node.$type);
 if ((isNodeTooltipAllowed && !tooltip.value.isActive)
 || (isNodeTooltipAllowed && tooltip.value.nodeId !== node.id)) {
 tooltip.value.nodeId = node.id;
 tooltip.value.nodeName = node.name;
 tooltip.value.isActive = true;
 nextTick(() => {
 tooltip.value.coordinates = { x: event.clientX, y: event.clientY };
 calculateTooltipPosition();
 });
 } else if (tooltip.value.nodeId === node.id && tooltip.value.isActive) {
 tooltip.value.isActive = false;
 }
};

const isTooltipLoading = (value) => {
 tooltip.value.isLoading = value;
};

const handleClick = (payload) => {
 if (isMappingActive.value) {
 setupTooltip(payload);
 }
};

watchEffect(() => {
 if (!tooltip.value.isLoading) {
 nextTick(() => {
 calculateTooltipPosition();
 });
 }
});

onMounted(() => {
 ProcessMaker.$modeler = modelerRef.value;
});

onBeforeUnmount(() => {
 ProcessMaker.$modeler = null;
 modelerRef.value?.$destroy();
 modelerRef.value = null;
 tooltipRef.value = null;
});
</script>

4 changes: 4 additions & 0 deletions
resources/jscomposition/cases/casesDetail/variables/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

30 changes: 30 additions & 0 deletions
resources/views/cases/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,16 @@ class="tw-grow tw-overflow-hidden"
@endsection

@section('js')
<script src="{{ mix('js/processes/modeler/initialLoad.js') }}"></script>
<script>
 window.ProcessMaker.packages = @json(\App::make(ProcessMaker\Managers\PackageManager::class)->listPackages());
 window.Processmaker = {
 csrfToken: "{{csrf_token()}}",
 userId: "{{\Auth::user()->id}}",
 messages: [],
 apiTimeout: {{config('app.api_timeout')}}
 };
</script>
 <script>
 const data = @json($request->getRequestData());
 const requestId = @json($request->getKey());
Expand All@@ -129,6 +139,26 @@ class="tw-grow tw-overflow-hidden"
 const canViewComments = @json($canViewComments);
 const comentable_type = @json(get_class($request));
 const requestCount = @json($requestCount);
 const inflightData = @json($inflightData);

 window.ProcessMaker.modeler = {
 xml: @json($bpmn),
 configurables: [],
 requestCompletedNodes: inflightData.requestCompletedNodes,
 requestInProgressNodes: inflightData.requestInProgressNodes,
 requestIdleNodes: inflightData.requestIdleNodes,
 requestId: inflightData.requestId,
 }

 window.ProcessMaker.EventBus.$on('modeler-start', ({
 loadXML
 }) => {
 loadXML(window.ProcessMaker.modeler.xml);
 });

 window.PM4ConfigOverrides = {
 requestFiles: @json($request->requestFiles())
 };
 </script>

 @if (hasPackage('package-files'))
Expand Down
Loading

, '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-20534: Implement the perfomance In-flight in Request and Cases#7816

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

pmPaulis
merged 3 commits into

from

Dec 12, 2024
 Merged


FOUR-20534: Implement the perfomance In-flight in Request and Cases
#7816
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f131993

FOUR-20534:Implement the improvements in Request and Cases


fagubla Dec 10, 2024
901b61b

add to Requests


fagubla Dec 11, 2024
50b32df

CR


fagubla Dec 12, 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


9 changes: 8 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 *
Expand DownExpand Up@@ -76,6 +78,9 @@ public function show($case_number)
 // Get the summary screen tranlations
 $this->summaryScreenTranslation($request);

 // Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];
 // Return the view
 return view('cases.edit', compact(
 'request',
Expand All@@ -85,7 +90,9 @@ public function show($case_number)
 'canViewComments',
 'canPrintScreens',
 'isProcessManager',
 'manager'
 'manager',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

8 changes: 8 additions & 0 deletions
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,15 @@
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;

class RequestController extends Controller
{
 use SearchAutocompleteTrait;
 use HasControllerAddons;
 use ProcessMapTrait;

 /**
 * Get the list of requests.
Expand DownExpand Up@@ -182,6 +184,10 @@ public function show(ProcessRequest $request, Media $mediaItems)
 }
 $this->summaryScreenTranslation($request);

 //Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];

 if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) {
 return view('requests.showMobile', compact(
 'request',
Expand DownExpand Up@@ -217,6 +223,8 @@ public function show(ProcessRequest $request, Media $mediaItems)
 'eligibleRollbackTask',
 'errorTask',
 'userConfiguration',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

42 changes: 42 additions & 0 deletions
ProcessMaker/Traits/ProcessMapTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Traits;

use Illuminate\Support\Collection;
use ProcessMaker\Bpmn\Process;
use ProcessMaker\Models\ProcessRequest;
use SimpleXMLElement;

Expand DownExpand Up@@ -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,
 ];
 }
}

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -67,7 +67,7 @@ const tabs = [
 name: translate.t("Summary"),
 href: "#summary",
 current: "summary",
 show: getRequestStatus() !== 'ERROR',
 show: getRequestStatus() !== "ERROR",
 content: TabSummary,
 },
 {
Expand Down

137 changes: 137 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/NewOverview.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
<template>
 <div
 class="tw-w-full tw-h-full tw-overflow-hidden tw-relative"
 data-test="body-container"
 >
 <ProcessMapTooltip
 v-show="showTooltip"
 ref="tooltipRef"
 :enabled="enableTooltip"
 :node-id="tooltip.nodeId"
 :node-name="tooltip.nodeName"
 :request-id="inflightData.requestId"
 :style="{
 left: `${tooltip.newX}px`,
 top: `${tooltip.newY}px`
 }"
 @is-loading="isTooltipLoading"
 />
 <transition
 name="fade"
 mode="in-out"
 >
 <Modeler
 ref="modelerRef"
 :key="keyModeler"
 :decorations="decorations"
 :request-completed-nodes="inflightData.requestCompletedNodes"
 :request-in-progress-nodes="inflightData.requestInProgressNodes"
 :request-idle-nodes="inflightData.requestIdleNodes"
 :read-only="true"
 @set-xml-manager="xmlManager = $event"
 @click="handleClick"
 />
 </transition>
 </div>
</template>

<script setup>
import {
 ref, watchEffect, onMounted, computed, nextTick, onBeforeUnmount,
} from "vue";
import { Modeler } from "@processmaker/modeler";
import ProcessMapTooltip from "../../../../js/processes/modeler/components/ProcessMapTooltip.vue";
import { getInflightData } from "../variables";

const keyModeler = ref(Math.random());
const modelerRef = ref("");
const tooltipRef = ref(null);
const enableTooltip = ref(true);
const decorations = ref({
 borderOutline: {},
});
const xmlManager = ref();
const tooltip = ref({
 isActive: false,
 isLoading: false,
 nodeId: null,
 nodeName: null,
 allowedNodes: [
 "bpmn:Task",
 "bpmn:ManualTask",
 "bpmn:SequenceFlow",
 "bpmn:ScriptTask",
 "bpmn:CallActivity",
 "bpmn:ServiceTask",
 ],
 coordinates: { x: 0, y: 0 },
 newX: 0,
 newY: 0,
});
const inflightData = ref(getInflightData());

const isMappingActive = computed(() => (window.ProcessMaker.modeler.enableProcessMapping !== undefined
 ? window.ProcessMaker.modeler.enableProcessMapping
 : true));

const showTooltip = computed(() => enableTooltip.value && tooltip.value.isActive);

const calculateTooltipPosition = () => {
 const rectTooltip = tooltipRef.value.$el.getBoundingClientRect();
 tooltip.value.newY = tooltip.value.coordinates.y - rectTooltip.height - 20;
 if (tooltip.value.newY <= 0) {
 tooltip.value.newY = 10;
 }
 tooltip.value.newX = tooltip.value.coordinates.x - (rectTooltip.width / 2);
 if (tooltip.value.newX < 0) {
 tooltip.value.newX = 0;
 } else if (tooltip.value.newX + rectTooltip.width > window.innerWidth) {
 tooltip.value.newX = window.innerWidth - rectTooltip.width;
 }
};

const setupTooltip = ({ event, node }) => {
 const isNodeTooltipAllowed = tooltip.value.allowedNodes.includes(node.$type);
 if ((isNodeTooltipAllowed && !tooltip.value.isActive)
 || (isNodeTooltipAllowed && tooltip.value.nodeId !== node.id)) {
 tooltip.value.nodeId = node.id;
 tooltip.value.nodeName = node.name;
 tooltip.value.isActive = true;
 nextTick(() => {
 tooltip.value.coordinates = { x: event.clientX, y: event.clientY };
 calculateTooltipPosition();
 });
 } else if (tooltip.value.nodeId === node.id && tooltip.value.isActive) {
 tooltip.value.isActive = false;
 }
};

const isTooltipLoading = (value) => {
 tooltip.value.isLoading = value;
};

const handleClick = (payload) => {
 if (isMappingActive.value) {
 setupTooltip(payload);
 }
};

watchEffect(() => {
 if (!tooltip.value.isLoading) {
 nextTick(() => {
 calculateTooltipPosition();
 });
 }
});

onMounted(() => {
 ProcessMaker.$modeler = modelerRef.value;
});

onBeforeUnmount(() => {
 ProcessMaker.$modeler = null;
 modelerRef.value?.$destroy();
 modelerRef.value = null;
 tooltipRef.value = null;
});
</script>

4 changes: 4 additions & 0 deletions
resources/jscomposition/cases/casesDetail/variables/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

30 changes: 30 additions & 0 deletions
resources/views/cases/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,16 @@ class="tw-grow tw-overflow-hidden"
@endsection

@section('js')
<script src="{{ mix('js/processes/modeler/initialLoad.js') }}"></script>
<script>
 window.ProcessMaker.packages = @json(\App::make(ProcessMaker\Managers\PackageManager::class)->listPackages());
 window.Processmaker = {
 csrfToken: "{{csrf_token()}}",
 userId: "{{\Auth::user()->id}}",
 messages: [],
 apiTimeout: {{config('app.api_timeout')}}
 };
</script>
 <script>
 const data = @json($request->getRequestData());
 const requestId = @json($request->getKey());
Expand All@@ -129,6 +139,26 @@ class="tw-grow tw-overflow-hidden"
 const canViewComments = @json($canViewComments);
 const comentable_type = @json(get_class($request));
 const requestCount = @json($requestCount);
 const inflightData = @json($inflightData);

 window.ProcessMaker.modeler = {
 xml: @json($bpmn),
 configurables: [],
 requestCompletedNodes: inflightData.requestCompletedNodes,
 requestInProgressNodes: inflightData.requestInProgressNodes,
 requestIdleNodes: inflightData.requestIdleNodes,
 requestId: inflightData.requestId,
 }

 window.ProcessMaker.EventBus.$on('modeler-start', ({
 loadXML
 }) => {
 loadXML(window.ProcessMaker.modeler.xml);
 });

 window.PM4ConfigOverrides = {
 requestFiles: @json($request->requestFiles())
 };
 </script>

 @if (hasPackage('package-files'))
Expand Down
Loading

, '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-20534: Implement the perfomance In-flight in Request and Cases#7816

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

pmPaulis
merged 3 commits into

from

Dec 12, 2024
 Merged


FOUR-20534: Implement the perfomance In-flight in Request and Cases
#7816
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f131993

FOUR-20534:Implement the improvements in Request and Cases


fagubla Dec 10, 2024
901b61b

add to Requests


fagubla Dec 11, 2024
50b32df

CR


fagubla Dec 12, 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


9 changes: 8 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 *
Expand DownExpand Up@@ -76,6 +78,9 @@ public function show($case_number)
 // Get the summary screen tranlations
 $this->summaryScreenTranslation($request);

 // Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];
 // Return the view
 return view('cases.edit', compact(
 'request',
Expand All@@ -85,7 +90,9 @@ public function show($case_number)
 'canViewComments',
 'canPrintScreens',
 'isProcessManager',
 'manager'
 'manager',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

8 changes: 8 additions & 0 deletions
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,15 @@
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;

class RequestController extends Controller
{
 use SearchAutocompleteTrait;
 use HasControllerAddons;
 use ProcessMapTrait;

 /**
 * Get the list of requests.
Expand DownExpand Up@@ -182,6 +184,10 @@ public function show(ProcessRequest $request, Media $mediaItems)
 }
 $this->summaryScreenTranslation($request);

 //Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];

 if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) {
 return view('requests.showMobile', compact(
 'request',
Expand DownExpand Up@@ -217,6 +223,8 @@ public function show(ProcessRequest $request, Media $mediaItems)
 'eligibleRollbackTask',
 'errorTask',
 'userConfiguration',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

42 changes: 42 additions & 0 deletions
ProcessMaker/Traits/ProcessMapTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Traits;

use Illuminate\Support\Collection;
use ProcessMaker\Bpmn\Process;
use ProcessMaker\Models\ProcessRequest;
use SimpleXMLElement;

Expand DownExpand Up@@ -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,
 ];
 }
}

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -67,7 +67,7 @@ const tabs = [
 name: translate.t("Summary"),
 href: "#summary",
 current: "summary",
 show: getRequestStatus() !== 'ERROR',
 show: getRequestStatus() !== "ERROR",
 content: TabSummary,
 },
 {
Expand Down

137 changes: 137 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/NewOverview.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
<template>
 <div
 class="tw-w-full tw-h-full tw-overflow-hidden tw-relative"
 data-test="body-container"
 >
 <ProcessMapTooltip
 v-show="showTooltip"
 ref="tooltipRef"
 :enabled="enableTooltip"
 :node-id="tooltip.nodeId"
 :node-name="tooltip.nodeName"
 :request-id="inflightData.requestId"
 :style="{
 left: `${tooltip.newX}px`,
 top: `${tooltip.newY}px`
 }"
 @is-loading="isTooltipLoading"
 />
 <transition
 name="fade"
 mode="in-out"
 >
 <Modeler
 ref="modelerRef"
 :key="keyModeler"
 :decorations="decorations"
 :request-completed-nodes="inflightData.requestCompletedNodes"
 :request-in-progress-nodes="inflightData.requestInProgressNodes"
 :request-idle-nodes="inflightData.requestIdleNodes"
 :read-only="true"
 @set-xml-manager="xmlManager = $event"
 @click="handleClick"
 />
 </transition>
 </div>
</template>

<script setup>
import {
 ref, watchEffect, onMounted, computed, nextTick, onBeforeUnmount,
} from "vue";
import { Modeler } from "@processmaker/modeler";
import ProcessMapTooltip from "../../../../js/processes/modeler/components/ProcessMapTooltip.vue";
import { getInflightData } from "../variables";

const keyModeler = ref(Math.random());
const modelerRef = ref("");
const tooltipRef = ref(null);
const enableTooltip = ref(true);
const decorations = ref({
 borderOutline: {},
});
const xmlManager = ref();
const tooltip = ref({
 isActive: false,
 isLoading: false,
 nodeId: null,
 nodeName: null,
 allowedNodes: [
 "bpmn:Task",
 "bpmn:ManualTask",
 "bpmn:SequenceFlow",
 "bpmn:ScriptTask",
 "bpmn:CallActivity",
 "bpmn:ServiceTask",
 ],
 coordinates: { x: 0, y: 0 },
 newX: 0,
 newY: 0,
});
const inflightData = ref(getInflightData());

const isMappingActive = computed(() => (window.ProcessMaker.modeler.enableProcessMapping !== undefined
 ? window.ProcessMaker.modeler.enableProcessMapping
 : true));

const showTooltip = computed(() => enableTooltip.value && tooltip.value.isActive);

const calculateTooltipPosition = () => {
 const rectTooltip = tooltipRef.value.$el.getBoundingClientRect();
 tooltip.value.newY = tooltip.value.coordinates.y - rectTooltip.height - 20;
 if (tooltip.value.newY <= 0) {
 tooltip.value.newY = 10;
 }
 tooltip.value.newX = tooltip.value.coordinates.x - (rectTooltip.width / 2);
 if (tooltip.value.newX < 0) {
 tooltip.value.newX = 0;
 } else if (tooltip.value.newX + rectTooltip.width > window.innerWidth) {
 tooltip.value.newX = window.innerWidth - rectTooltip.width;
 }
};

const setupTooltip = ({ event, node }) => {
 const isNodeTooltipAllowed = tooltip.value.allowedNodes.includes(node.$type);
 if ((isNodeTooltipAllowed && !tooltip.value.isActive)
 || (isNodeTooltipAllowed && tooltip.value.nodeId !== node.id)) {
 tooltip.value.nodeId = node.id;
 tooltip.value.nodeName = node.name;
 tooltip.value.isActive = true;
 nextTick(() => {
 tooltip.value.coordinates = { x: event.clientX, y: event.clientY };
 calculateTooltipPosition();
 });
 } else if (tooltip.value.nodeId === node.id && tooltip.value.isActive) {
 tooltip.value.isActive = false;
 }
};

const isTooltipLoading = (value) => {
 tooltip.value.isLoading = value;
};

const handleClick = (payload) => {
 if (isMappingActive.value) {
 setupTooltip(payload);
 }
};

watchEffect(() => {
 if (!tooltip.value.isLoading) {
 nextTick(() => {
 calculateTooltipPosition();
 });
 }
});

onMounted(() => {
 ProcessMaker.$modeler = modelerRef.value;
});

onBeforeUnmount(() => {
 ProcessMaker.$modeler = null;
 modelerRef.value?.$destroy();
 modelerRef.value = null;
 tooltipRef.value = null;
});
</script>

4 changes: 4 additions & 0 deletions
resources/jscomposition/cases/casesDetail/variables/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

30 changes: 30 additions & 0 deletions
resources/views/cases/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,16 @@ class="tw-grow tw-overflow-hidden"
@endsection

@section('js')
<script src="{{ mix('js/processes/modeler/initialLoad.js') }}"></script>
<script>
 window.ProcessMaker.packages = @json(\App::make(ProcessMaker\Managers\PackageManager::class)->listPackages());
 window.Processmaker = {
 csrfToken: "{{csrf_token()}}",
 userId: "{{\Auth::user()->id}}",
 messages: [],
 apiTimeout: {{config('app.api_timeout')}}
 };
</script>
 <script>
 const data = @json($request->getRequestData());
 const requestId = @json($request->getKey());
Expand All@@ -129,6 +139,26 @@ class="tw-grow tw-overflow-hidden"
 const canViewComments = @json($canViewComments);
 const comentable_type = @json(get_class($request));
 const requestCount = @json($requestCount);
 const inflightData = @json($inflightData);

 window.ProcessMaker.modeler = {
 xml: @json($bpmn),
 configurables: [],
 requestCompletedNodes: inflightData.requestCompletedNodes,
 requestInProgressNodes: inflightData.requestInProgressNodes,
 requestIdleNodes: inflightData.requestIdleNodes,
 requestId: inflightData.requestId,
 }

 window.ProcessMaker.EventBus.$on('modeler-start', ({
 loadXML
 }) => {
 loadXML(window.ProcessMaker.modeler.xml);
 });

 window.PM4ConfigOverrides = {
 requestFiles: @json($request->requestFiles())
 };
 </script>

 @if (hasPackage('package-files'))
Expand Down
Loading

, '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-20534: Implement the perfomance In-flight in Request and Cases#7816

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

pmPaulis
merged 3 commits into

from

Dec 12, 2024
 Merged


FOUR-20534: Implement the perfomance In-flight in Request and Cases
#7816
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f131993

FOUR-20534:Implement the improvements in Request and Cases


fagubla Dec 10, 2024
901b61b

add to Requests


fagubla Dec 11, 2024
50b32df

CR


fagubla Dec 12, 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


9 changes: 8 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 *
Expand DownExpand Up@@ -76,6 +78,9 @@ public function show($case_number)
 // Get the summary screen tranlations
 $this->summaryScreenTranslation($request);

 // Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];
 // Return the view
 return view('cases.edit', compact(
 'request',
Expand All@@ -85,7 +90,9 @@ public function show($case_number)
 'canViewComments',
 'canPrintScreens',
 'isProcessManager',
 'manager'
 'manager',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

8 changes: 8 additions & 0 deletions
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,15 @@
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;

class RequestController extends Controller
{
 use SearchAutocompleteTrait;
 use HasControllerAddons;
 use ProcessMapTrait;

 /**
 * Get the list of requests.
Expand DownExpand Up@@ -182,6 +184,10 @@ public function show(ProcessRequest $request, Media $mediaItems)
 }
 $this->summaryScreenTranslation($request);

 //Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];

 if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) {
 return view('requests.showMobile', compact(
 'request',
Expand DownExpand Up@@ -217,6 +223,8 @@ public function show(ProcessRequest $request, Media $mediaItems)
 'eligibleRollbackTask',
 'errorTask',
 'userConfiguration',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

42 changes: 42 additions & 0 deletions
ProcessMaker/Traits/ProcessMapTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Traits;

use Illuminate\Support\Collection;
use ProcessMaker\Bpmn\Process;
use ProcessMaker\Models\ProcessRequest;
use SimpleXMLElement;

Expand DownExpand Up@@ -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,
 ];
 }
}

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -67,7 +67,7 @@ const tabs = [
 name: translate.t("Summary"),
 href: "#summary",
 current: "summary",
 show: getRequestStatus() !== 'ERROR',
 show: getRequestStatus() !== "ERROR",
 content: TabSummary,
 },
 {
Expand Down

137 changes: 137 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/NewOverview.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
<template>
 <div
 class="tw-w-full tw-h-full tw-overflow-hidden tw-relative"
 data-test="body-container"
 >
 <ProcessMapTooltip
 v-show="showTooltip"
 ref="tooltipRef"
 :enabled="enableTooltip"
 :node-id="tooltip.nodeId"
 :node-name="tooltip.nodeName"
 :request-id="inflightData.requestId"
 :style="{
 left: `${tooltip.newX}px`,
 top: `${tooltip.newY}px`
 }"
 @is-loading="isTooltipLoading"
 />
 <transition
 name="fade"
 mode="in-out"
 >
 <Modeler
 ref="modelerRef"
 :key="keyModeler"
 :decorations="decorations"
 :request-completed-nodes="inflightData.requestCompletedNodes"
 :request-in-progress-nodes="inflightData.requestInProgressNodes"
 :request-idle-nodes="inflightData.requestIdleNodes"
 :read-only="true"
 @set-xml-manager="xmlManager = $event"
 @click="handleClick"
 />
 </transition>
 </div>
</template>

<script setup>
import {
 ref, watchEffect, onMounted, computed, nextTick, onBeforeUnmount,
} from "vue";
import { Modeler } from "@processmaker/modeler";
import ProcessMapTooltip from "../../../../js/processes/modeler/components/ProcessMapTooltip.vue";
import { getInflightData } from "../variables";

const keyModeler = ref(Math.random());
const modelerRef = ref("");
const tooltipRef = ref(null);
const enableTooltip = ref(true);
const decorations = ref({
 borderOutline: {},
});
const xmlManager = ref();
const tooltip = ref({
 isActive: false,
 isLoading: false,
 nodeId: null,
 nodeName: null,
 allowedNodes: [
 "bpmn:Task",
 "bpmn:ManualTask",
 "bpmn:SequenceFlow",
 "bpmn:ScriptTask",
 "bpmn:CallActivity",
 "bpmn:ServiceTask",
 ],
 coordinates: { x: 0, y: 0 },
 newX: 0,
 newY: 0,
});
const inflightData = ref(getInflightData());

const isMappingActive = computed(() => (window.ProcessMaker.modeler.enableProcessMapping !== undefined
 ? window.ProcessMaker.modeler.enableProcessMapping
 : true));

const showTooltip = computed(() => enableTooltip.value && tooltip.value.isActive);

const calculateTooltipPosition = () => {
 const rectTooltip = tooltipRef.value.$el.getBoundingClientRect();
 tooltip.value.newY = tooltip.value.coordinates.y - rectTooltip.height - 20;
 if (tooltip.value.newY <= 0) {
 tooltip.value.newY = 10;
 }
 tooltip.value.newX = tooltip.value.coordinates.x - (rectTooltip.width / 2);
 if (tooltip.value.newX < 0) {
 tooltip.value.newX = 0;
 } else if (tooltip.value.newX + rectTooltip.width > window.innerWidth) {
 tooltip.value.newX = window.innerWidth - rectTooltip.width;
 }
};

const setupTooltip = ({ event, node }) => {
 const isNodeTooltipAllowed = tooltip.value.allowedNodes.includes(node.$type);
 if ((isNodeTooltipAllowed && !tooltip.value.isActive)
 || (isNodeTooltipAllowed && tooltip.value.nodeId !== node.id)) {
 tooltip.value.nodeId = node.id;
 tooltip.value.nodeName = node.name;
 tooltip.value.isActive = true;
 nextTick(() => {
 tooltip.value.coordinates = { x: event.clientX, y: event.clientY };
 calculateTooltipPosition();
 });
 } else if (tooltip.value.nodeId === node.id && tooltip.value.isActive) {
 tooltip.value.isActive = false;
 }
};

const isTooltipLoading = (value) => {
 tooltip.value.isLoading = value;
};

const handleClick = (payload) => {
 if (isMappingActive.value) {
 setupTooltip(payload);
 }
};

watchEffect(() => {
 if (!tooltip.value.isLoading) {
 nextTick(() => {
 calculateTooltipPosition();
 });
 }
});

onMounted(() => {
 ProcessMaker.$modeler = modelerRef.value;
});

onBeforeUnmount(() => {
 ProcessMaker.$modeler = null;
 modelerRef.value?.$destroy();
 modelerRef.value = null;
 tooltipRef.value = null;
});
</script>

4 changes: 4 additions & 0 deletions
resources/jscomposition/cases/casesDetail/variables/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

30 changes: 30 additions & 0 deletions
resources/views/cases/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,16 @@ class="tw-grow tw-overflow-hidden"
@endsection

@section('js')
<script src="{{ mix('js/processes/modeler/initialLoad.js') }}"></script>
<script>
 window.ProcessMaker.packages = @json(\App::make(ProcessMaker\Managers\PackageManager::class)->listPackages());
 window.Processmaker = {
 csrfToken: "{{csrf_token()}}",
 userId: "{{\Auth::user()->id}}",
 messages: [],
 apiTimeout: {{config('app.api_timeout')}}
 };
</script>
 <script>
 const data = @json($request->getRequestData());
 const requestId = @json($request->getKey());
Expand All@@ -129,6 +139,26 @@ class="tw-grow tw-overflow-hidden"
 const canViewComments = @json($canViewComments);
 const comentable_type = @json(get_class($request));
 const requestCount = @json($requestCount);
 const inflightData = @json($inflightData);

 window.ProcessMaker.modeler = {
 xml: @json($bpmn),
 configurables: [],
 requestCompletedNodes: inflightData.requestCompletedNodes,
 requestInProgressNodes: inflightData.requestInProgressNodes,
 requestIdleNodes: inflightData.requestIdleNodes,
 requestId: inflightData.requestId,
 }

 window.ProcessMaker.EventBus.$on('modeler-start', ({
 loadXML
 }) => {
 loadXML(window.ProcessMaker.modeler.xml);
 });

 window.PM4ConfigOverrides = {
 requestFiles: @json($request->requestFiles())
 };
 </script>

 @if (hasPackage('package-files'))
Expand Down
Loading

, '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-20534: Implement the perfomance In-flight in Request and Cases#7816

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

pmPaulis
merged 3 commits into

from

Dec 12, 2024
 Merged


FOUR-20534: Implement the perfomance In-flight in Request and Cases
#7816
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f131993

FOUR-20534:Implement the improvements in Request and Cases


fagubla Dec 10, 2024
901b61b

add to Requests


fagubla Dec 11, 2024
50b32df

CR


fagubla Dec 12, 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


9 changes: 8 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 *
Expand DownExpand Up@@ -76,6 +78,9 @@ public function show($case_number)
 // Get the summary screen tranlations
 $this->summaryScreenTranslation($request);

 // Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];
 // Return the view
 return view('cases.edit', compact(
 'request',
Expand All@@ -85,7 +90,9 @@ public function show($case_number)
 'canViewComments',
 'canPrintScreens',
 'isProcessManager',
 'manager'
 'manager',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

8 changes: 8 additions & 0 deletions
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,15 @@
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;

class RequestController extends Controller
{
 use SearchAutocompleteTrait;
 use HasControllerAddons;
 use ProcessMapTrait;

 /**
 * Get the list of requests.
Expand DownExpand Up@@ -182,6 +184,10 @@ public function show(ProcessRequest $request, Media $mediaItems)
 }
 $this->summaryScreenTranslation($request);

 //Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];

 if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) {
 return view('requests.showMobile', compact(
 'request',
Expand DownExpand Up@@ -217,6 +223,8 @@ public function show(ProcessRequest $request, Media $mediaItems)
 'eligibleRollbackTask',
 'errorTask',
 'userConfiguration',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

42 changes: 42 additions & 0 deletions
ProcessMaker/Traits/ProcessMapTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Traits;

use Illuminate\Support\Collection;
use ProcessMaker\Bpmn\Process;
use ProcessMaker\Models\ProcessRequest;
use SimpleXMLElement;

Expand DownExpand Up@@ -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,
 ];
 }
}

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -67,7 +67,7 @@ const tabs = [
 name: translate.t("Summary"),
 href: "#summary",
 current: "summary",
 show: getRequestStatus() !== 'ERROR',
 show: getRequestStatus() !== "ERROR",
 content: TabSummary,
 },
 {
Expand Down

137 changes: 137 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/NewOverview.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
<template>
 <div
 class="tw-w-full tw-h-full tw-overflow-hidden tw-relative"
 data-test="body-container"
 >
 <ProcessMapTooltip
 v-show="showTooltip"
 ref="tooltipRef"
 :enabled="enableTooltip"
 :node-id="tooltip.nodeId"
 :node-name="tooltip.nodeName"
 :request-id="inflightData.requestId"
 :style="{
 left: `${tooltip.newX}px`,
 top: `${tooltip.newY}px`
 }"
 @is-loading="isTooltipLoading"
 />
 <transition
 name="fade"
 mode="in-out"
 >
 <Modeler
 ref="modelerRef"
 :key="keyModeler"
 :decorations="decorations"
 :request-completed-nodes="inflightData.requestCompletedNodes"
 :request-in-progress-nodes="inflightData.requestInProgressNodes"
 :request-idle-nodes="inflightData.requestIdleNodes"
 :read-only="true"
 @set-xml-manager="xmlManager = $event"
 @click="handleClick"
 />
 </transition>
 </div>
</template>

<script setup>
import {
 ref, watchEffect, onMounted, computed, nextTick, onBeforeUnmount,
} from "vue";
import { Modeler } from "@processmaker/modeler";
import ProcessMapTooltip from "../../../../js/processes/modeler/components/ProcessMapTooltip.vue";
import { getInflightData } from "../variables";

const keyModeler = ref(Math.random());
const modelerRef = ref("");
const tooltipRef = ref(null);
const enableTooltip = ref(true);
const decorations = ref({
 borderOutline: {},
});
const xmlManager = ref();
const tooltip = ref({
 isActive: false,
 isLoading: false,
 nodeId: null,
 nodeName: null,
 allowedNodes: [
 "bpmn:Task",
 "bpmn:ManualTask",
 "bpmn:SequenceFlow",
 "bpmn:ScriptTask",
 "bpmn:CallActivity",
 "bpmn:ServiceTask",
 ],
 coordinates: { x: 0, y: 0 },
 newX: 0,
 newY: 0,
});
const inflightData = ref(getInflightData());

const isMappingActive = computed(() => (window.ProcessMaker.modeler.enableProcessMapping !== undefined
 ? window.ProcessMaker.modeler.enableProcessMapping
 : true));

const showTooltip = computed(() => enableTooltip.value && tooltip.value.isActive);

const calculateTooltipPosition = () => {
 const rectTooltip = tooltipRef.value.$el.getBoundingClientRect();
 tooltip.value.newY = tooltip.value.coordinates.y - rectTooltip.height - 20;
 if (tooltip.value.newY <= 0) {
 tooltip.value.newY = 10;
 }
 tooltip.value.newX = tooltip.value.coordinates.x - (rectTooltip.width / 2);
 if (tooltip.value.newX < 0) {
 tooltip.value.newX = 0;
 } else if (tooltip.value.newX + rectTooltip.width > window.innerWidth) {
 tooltip.value.newX = window.innerWidth - rectTooltip.width;
 }
};

const setupTooltip = ({ event, node }) => {
 const isNodeTooltipAllowed = tooltip.value.allowedNodes.includes(node.$type);
 if ((isNodeTooltipAllowed && !tooltip.value.isActive)
 || (isNodeTooltipAllowed && tooltip.value.nodeId !== node.id)) {
 tooltip.value.nodeId = node.id;
 tooltip.value.nodeName = node.name;
 tooltip.value.isActive = true;
 nextTick(() => {
 tooltip.value.coordinates = { x: event.clientX, y: event.clientY };
 calculateTooltipPosition();
 });
 } else if (tooltip.value.nodeId === node.id && tooltip.value.isActive) {
 tooltip.value.isActive = false;
 }
};

const isTooltipLoading = (value) => {
 tooltip.value.isLoading = value;
};

const handleClick = (payload) => {
 if (isMappingActive.value) {
 setupTooltip(payload);
 }
};

watchEffect(() => {
 if (!tooltip.value.isLoading) {
 nextTick(() => {
 calculateTooltipPosition();
 });
 }
});

onMounted(() => {
 ProcessMaker.$modeler = modelerRef.value;
});

onBeforeUnmount(() => {
 ProcessMaker.$modeler = null;
 modelerRef.value?.$destroy();
 modelerRef.value = null;
 tooltipRef.value = null;
});
</script>

4 changes: 4 additions & 0 deletions
resources/jscomposition/cases/casesDetail/variables/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

30 changes: 30 additions & 0 deletions
resources/views/cases/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,16 @@ class="tw-grow tw-overflow-hidden"
@endsection

@section('js')
<script src="{{ mix('js/processes/modeler/initialLoad.js') }}"></script>
<script>
 window.ProcessMaker.packages = @json(\App::make(ProcessMaker\Managers\PackageManager::class)->listPackages());
 window.Processmaker = {
 csrfToken: "{{csrf_token()}}",
 userId: "{{\Auth::user()->id}}",
 messages: [],
 apiTimeout: {{config('app.api_timeout')}}
 };
</script>
 <script>
 const data = @json($request->getRequestData());
 const requestId = @json($request->getKey());
Expand All@@ -129,6 +139,26 @@ class="tw-grow tw-overflow-hidden"
 const canViewComments = @json($canViewComments);
 const comentable_type = @json(get_class($request));
 const requestCount = @json($requestCount);
 const inflightData = @json($inflightData);

 window.ProcessMaker.modeler = {
 xml: @json($bpmn),
 configurables: [],
 requestCompletedNodes: inflightData.requestCompletedNodes,
 requestInProgressNodes: inflightData.requestInProgressNodes,
 requestIdleNodes: inflightData.requestIdleNodes,
 requestId: inflightData.requestId,
 }

 window.ProcessMaker.EventBus.$on('modeler-start', ({
 loadXML
 }) => {
 loadXML(window.ProcessMaker.modeler.xml);
 });

 window.PM4ConfigOverrides = {
 requestFiles: @json($request->requestFiles())
 };
 </script>

 @if (hasPackage('package-files'))
Expand Down
Loading

, '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-20534: Implement the perfomance In-flight in Request and Cases#7816

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

pmPaulis
merged 3 commits into

from

Dec 12, 2024
 Merged


FOUR-20534: Implement the perfomance In-flight in Request and Cases
#7816
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


3 commits


Select commit
Hold shift + click to select a range
f131993

FOUR-20534:Implement the improvements in Request and Cases


fagubla Dec 10, 2024
901b61b

add to Requests


fagubla Dec 11, 2024
50b32df

CR


fagubla Dec 12, 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


9 changes: 8 additions & 1 deletion
ProcessMaker/Http/Controllers/CasesController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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.
 *
Expand DownExpand Up@@ -76,6 +78,9 @@ public function show($case_number)
 // Get the summary screen tranlations
 $this->summaryScreenTranslation($request);

 // Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];
 // Return the view
 return view('cases.edit', compact(
 'request',
Expand All@@ -85,7 +90,9 @@ public function show($case_number)
 'canViewComments',
 'canPrintScreens',
 'isProcessManager',
 'manager'
 'manager',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

8 changes: 8 additions & 0 deletions
ProcessMaker/Http/Controllers/RequestController.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -28,13 +28,15 @@
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;

class RequestController extends Controller
{
 use SearchAutocompleteTrait;
 use HasControllerAddons;
 use ProcessMapTrait;

 /**
 * Get the list of requests.
Expand DownExpand Up@@ -182,6 +184,10 @@ public function show(ProcessRequest $request, Media $mediaItems)
 }
 $this->summaryScreenTranslation($request);

 //Load the process map
 $inflightData = $this->loadProcessMap($request);
 $bpmn = $inflightData['bpmn'];

 if (isset($_SERVER['HTTP_USER_AGENT']) && MobileHelper::isMobile($_SERVER['HTTP_USER_AGENT'])) {
 return view('requests.showMobile', compact(
 'request',
Expand DownExpand Up@@ -217,6 +223,8 @@ public function show(ProcessRequest $request, Media $mediaItems)
 'eligibleRollbackTask',
 'errorTask',
 'userConfiguration',
 'bpmn',
 'inflightData',
 ));
 }

Expand Down

42 changes: 42 additions & 0 deletions
ProcessMaker/Traits/ProcessMapTrait.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -3,6 +3,7 @@
namespace ProcessMaker\Traits;

use Illuminate\Support\Collection;
use ProcessMaker\Bpmn\Process;
use ProcessMaker\Models\ProcessRequest;
use SimpleXMLElement;

Expand DownExpand Up@@ -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,
 ];
 }
}

4 changes: 2 additions & 2 deletions
resources/jscomposition/cases/casesDetail/components/CaseDetail.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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";
Expand DownExpand Up@@ -67,7 +67,7 @@ const tabs = [
 name: translate.t("Summary"),
 href: "#summary",
 current: "summary",
 show: getRequestStatus() !== 'ERROR',
 show: getRequestStatus() !== "ERROR",
 content: TabSummary,
 },
 {
Expand Down

137 changes: 137 additions & 0 deletions
resources/jscomposition/cases/casesDetail/components/NewOverview.vue

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
<template>
 <div
 class="tw-w-full tw-h-full tw-overflow-hidden tw-relative"
 data-test="body-container"
 >
 <ProcessMapTooltip
 v-show="showTooltip"
 ref="tooltipRef"
 :enabled="enableTooltip"
 :node-id="tooltip.nodeId"
 :node-name="tooltip.nodeName"
 :request-id="inflightData.requestId"
 :style="{
 left: `${tooltip.newX}px`,
 top: `${tooltip.newY}px`
 }"
 @is-loading="isTooltipLoading"
 />
 <transition
 name="fade"
 mode="in-out"
 >
 <Modeler
 ref="modelerRef"
 :key="keyModeler"
 :decorations="decorations"
 :request-completed-nodes="inflightData.requestCompletedNodes"
 :request-in-progress-nodes="inflightData.requestInProgressNodes"
 :request-idle-nodes="inflightData.requestIdleNodes"
 :read-only="true"
 @set-xml-manager="xmlManager = $event"
 @click="handleClick"
 />
 </transition>
 </div>
</template>

<script setup>
import {
 ref, watchEffect, onMounted, computed, nextTick, onBeforeUnmount,
} from "vue";
import { Modeler } from "@processmaker/modeler";
import ProcessMapTooltip from "../../../../js/processes/modeler/components/ProcessMapTooltip.vue";
import { getInflightData } from "../variables";

const keyModeler = ref(Math.random());
const modelerRef = ref("");
const tooltipRef = ref(null);
const enableTooltip = ref(true);
const decorations = ref({
 borderOutline: {},
});
const xmlManager = ref();
const tooltip = ref({
 isActive: false,
 isLoading: false,
 nodeId: null,
 nodeName: null,
 allowedNodes: [
 "bpmn:Task",
 "bpmn:ManualTask",
 "bpmn:SequenceFlow",
 "bpmn:ScriptTask",
 "bpmn:CallActivity",
 "bpmn:ServiceTask",
 ],
 coordinates: { x: 0, y: 0 },
 newX: 0,
 newY: 0,
});
const inflightData = ref(getInflightData());

const isMappingActive = computed(() => (window.ProcessMaker.modeler.enableProcessMapping !== undefined
 ? window.ProcessMaker.modeler.enableProcessMapping
 : true));

const showTooltip = computed(() => enableTooltip.value && tooltip.value.isActive);

const calculateTooltipPosition = () => {
 const rectTooltip = tooltipRef.value.$el.getBoundingClientRect();
 tooltip.value.newY = tooltip.value.coordinates.y - rectTooltip.height - 20;
 if (tooltip.value.newY <= 0) {
 tooltip.value.newY = 10;
 }
 tooltip.value.newX = tooltip.value.coordinates.x - (rectTooltip.width / 2);
 if (tooltip.value.newX < 0) {
 tooltip.value.newX = 0;
 } else if (tooltip.value.newX + rectTooltip.width > window.innerWidth) {
 tooltip.value.newX = window.innerWidth - rectTooltip.width;
 }
};

const setupTooltip = ({ event, node }) => {
 const isNodeTooltipAllowed = tooltip.value.allowedNodes.includes(node.$type);
 if ((isNodeTooltipAllowed && !tooltip.value.isActive)
 || (isNodeTooltipAllowed && tooltip.value.nodeId !== node.id)) {
 tooltip.value.nodeId = node.id;
 tooltip.value.nodeName = node.name;
 tooltip.value.isActive = true;
 nextTick(() => {
 tooltip.value.coordinates = { x: event.clientX, y: event.clientY };
 calculateTooltipPosition();
 });
 } else if (tooltip.value.nodeId === node.id && tooltip.value.isActive) {
 tooltip.value.isActive = false;
 }
};

const isTooltipLoading = (value) => {
 tooltip.value.isLoading = value;
};

const handleClick = (payload) => {
 if (isMappingActive.value) {
 setupTooltip(payload);
 }
};

watchEffect(() => {
 if (!tooltip.value.isLoading) {
 nextTick(() => {
 calculateTooltipPosition();
 });
 }
});

onMounted(() => {
 ProcessMaker.$modeler = modelerRef.value;
});

onBeforeUnmount(() => {
 ProcessMaker.$modeler = null;
 modelerRef.value?.$destroy();
 modelerRef.value = null;
 tooltipRef.value = null;
});
</script>

4 changes: 4 additions & 0 deletions
resources/jscomposition/cases/casesDetail/variables/index.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -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;

30 changes: 30 additions & 0 deletions
resources/views/cases/edit.blade.php

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -118,6 +118,16 @@ class="tw-grow tw-overflow-hidden"
@endsection

@section('js')
<script src="{{ mix('js/processes/modeler/initialLoad.js') }}"></script>
<script>
 window.ProcessMaker.packages = @json(\App::make(ProcessMaker\Managers\PackageManager::class)->listPackages());
 window.Processmaker = {
 csrfToken: "{{csrf_token()}}",
 userId: "{{\Auth::user()->id}}",
 messages: [],
 apiTimeout: {{config('app.api_timeout')}}
 };
</script>
 <script>
 const data = @json($request->getRequestData());
 const requestId = @json($request->getKey());
Expand All@@ -129,6 +139,26 @@ class="tw-grow tw-overflow-hidden"
 const canViewComments = @json($canViewComments);
 const comentable_type = @json(get_class($request));
 const requestCount = @json($requestCount);
 const inflightData = @json($inflightData);

 window.ProcessMaker.modeler = {
 xml: @json($bpmn),
 configurables: [],
 requestCompletedNodes: inflightData.requestCompletedNodes,
 requestInProgressNodes: inflightData.requestInProgressNodes,
 requestIdleNodes: inflightData.requestIdleNodes,
 requestId: inflightData.requestId,
 }

 window.ProcessMaker.EventBus.$on('modeler-start', ({
 loadXML
 }) => {
 loadXML(window.ProcessMaker.modeler.xml);
 });

 window.PM4ConfigOverrides = {
 requestFiles: @json($request->requestFiles())
 };
 </script>

 @if (hasPackage('package-files'))
Expand Down
Loading