WIP refactor

Author: philippfromme

demo/App.jsx

@@ -67,18 +67,18 @@ function App() {
   const deploy = async () => {
     const { xml } = await modeler.saveXML();
 
-    const payload = { xml };
+    const resources = [ { name: 'diagram.bpmn', content: xml } ];
 
     if (form) {
-      payload.form = form;
+      resources.push({ name: 'form.form', content: form });
     }
 
     const response = await fetch('/api/deploy', {
       method: 'POST',
       headers: {
         'Content-Type': 'application/json'
       },
-      body: JSON.stringify(payload)
+      body: JSON.stringify({ resources })
     });
 
     return await response.json();

demo/api.mjs

@@ -107,35 +107,12 @@ export function createApi(client) {
 }
 
 // ---------------------------------------------------------------------------
-// Response-shape helpers
+// Response-shape helpers — canonical implementations live in lib/TaskExecution.js
 // ---------------------------------------------------------------------------
 
-export function getProcessDefinitionKey(deployResponse, processId) {
-  const items = deployResponse && (deployResponse.deployments || deployResponse.processes || []);
-  for (const item of items) {
-    const def = item.processDefinition || item;
-    if (def.processDefinitionId === processId) {
-      return def.processDefinitionKey;
-    }
-  }
-  return null;
-}
-
-export function getProcessInstanceKey(startResponse) {
-  if (!startResponse) return null;
-  return String(
-    startResponse.processInstanceKey ||
-    (startResponse.items && startResponse.items[0] && startResponse.items[0].processInstanceKey) ||
-    ''
-  ) || null;
-}
-
-export function getProcessInstanceState(piResult) {
-  const items = piResult && piResult.response && piResult.response.items;
-  return items && items[0] && items[0].state;
-}
-
-export function hasProcessInstanceIncident(piResult) {
-  const items = piResult && piResult.response && piResult.response.items;
-  return !!(items && items[0] && items[0].hasIncident);
-}
+export {
+  getProcessDefinitionKey,
+  getProcessInstanceKey,
+  getProcessInstanceState,
+  hasProcessInstanceIncident
+} from '../lib/TaskExecution.js';

demo/server.mjs

@@ -97,10 +97,7 @@ app.post('/api/deploy', async (req, res) => {
     return res.json({ success: false, error: 'Camunda environment not configured' });
   }
 
-  const { xml, form } = req.body;
-
-  const resources = [ { name: 'diagram.bpmn', content: xml } ];
-  if (form) resources.push({ name: 'form.form', content: form });
+  const { resources } = req.body;
 
   const result = await api.deployResources(resources);
   recorder.record('deploy', result);

lib/TaskExecution.js

@@ -324,7 +324,7 @@ export default class TaskExecution extends EventEmitter {
  *
  * @returns {string|null} The process instance key or null if not found.
  */
-function getProcessInstanceKey(response) {
+export function getProcessInstanceKey(response) {
   const { processInstanceKey } = response;
 
   return processInstanceKey || null;
@@ -340,7 +340,7 @@ function getProcessInstance(response, processInstanceKey) {
   return items.find(item => item.processInstanceKey === processInstanceKey) || null;
 }
 
-function getProcessInstanceState(response, processInstanceKey) {
+export function getProcessInstanceState(response, processInstanceKey) {
   const processInstance = getProcessInstance(response, processInstanceKey);
 
   if (!processInstance) {
@@ -350,7 +350,7 @@ function getProcessInstanceState(response, processInstanceKey) {
   return processInstance.state;
 }
 
-function hasProcessInstanceIncident(response, processInstanceKey) {
+export function hasProcessInstanceIncident(response, processInstanceKey) {
   const processInstance = getProcessInstance(response, processInstanceKey);
 
   if (!processInstance) {

test/scenarios/run.mjs

@@ -247,14 +247,14 @@ async function runScenario(scenarioPath) {
     };
 
     // Append incidentResult when the process instance has an active incident
-    const hasIncident = hasProcessInstanceIncident(processInstanceResult);
+    const hasIncident = hasProcessInstanceIncident(processInstanceResult.response, processInstanceKey);
     if (hasIncident) {
       pollData.incidentResult = await api.searchIncidents(processInstanceKey);
     }
 
     recorder.record('poll', pollData);
 
-    const state = getProcessInstanceState(processInstanceResult);
+    const state = getProcessInstanceState(processInstanceResult.response, processInstanceKey);
     const isTerminal = [ 'COMPLETED', 'TERMINATED', 'CANCELED' ].includes(state);
 
     if (isTerminal) {