From 455fe53fe2f6c5036e91ade73a273b39ea96c9b1 Mon Sep 17 00:00:00 2001
From: NicolasCantu <nicolas.cantu@pm.me>
Date: Wed, 26 Mar 2025 14:41:35 +0100
Subject: [PATCH] getRoles and getPublicData both returns value in the first
 uncommited state if necessary

---
 src/services/service.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/services/service.ts b/src/services/service.ts
index bd4db84..2143c8a 100755
--- a/src/services/service.ts
+++ b/src/services/service.ts
@@ -1370,6 +1370,11 @@ export default class Services {
     const lastCommitedState = this.getLastCommitedState(process);
     if (lastCommitedState && lastCommitedState.roles && Object.keys(lastCommitedState.roles).length != 0) {
       return lastCommitedState!.roles;
+    } else if (process.states.length === 2) {
+      const firstState = process.states[0];
+      if (firstState && firstState.roles && Object.keys(firstState.roles).length != 0) {
+        return firstState!.roles;
+      }
     } else {
       return null;
     }
@@ -1377,8 +1382,13 @@ export default class Services {
 
   public getPublicData(process: Process): Record<string, any> | null {
     const lastCommitedState = this.getLastCommitedState(process);
-    if (lastCommitedState && lastCommitedState.public_data) {
-      return lastCommitedState.public_data;
+    if (lastCommitedState && lastCommitedState.public_data && Object.keys(lastCommitedState.public_data).length != 0) {
+      return lastCommitedState!.public_data;
+    } else if (process.states.length === 2) {
+      const firstState = process.states[0];
+      if (firstState && firstState.public_data && Object.keys(firstState.public_data).length != 0) {
+        return firstState!.public_data;
+      }
     } else {
       return null;
     }