From 6d7fda1421ff82bc7f731b0bc40119da1b16702e Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Tue, 30 Jun 2026 10:58:06 -0600
Subject: [PATCH 01/52] FOUR-31727: Fix DevLink bundle listing and selector
 search

---
 .../admin/devlink/components/LocalBundles.vue | 40 +++++++++--
 .../js/components/shared/AddToBundle.vue      | 13 +++-
 .../js/components/shared/BackendSelect.vue    | 56 ++++++++++++---
 tests/Feature/Api/DevLinkTest.php             | 72 +++++++++++++++++++
 4 files changed, 166 insertions(+), 15 deletions(-)

diff --git a/resources/js/admin/devlink/components/LocalBundles.vue b/resources/js/admin/devlink/components/LocalBundles.vue
index 6a57f68285..d97d748e4a 100644
--- a/resources/js/admin/devlink/components/LocalBundles.vue
+++ b/resources/js/admin/devlink/components/LocalBundles.vue
@@ -8,11 +8,15 @@ import BundleModal from './BundleModal.vue';
 import DeleteModal from './DeleteModal.vue';
 import { useRouter, useRoute } from 'vue-router/composables';
 import UpdateBundle from './UpdateBundle.vue';
+import PaginationTable from '../../../components/shared/PaginationTable.vue';
 
 const vue = getCurrentInstance().proxy;
 const router = useRouter();
 const route = useRoute();
 const bundles = ref([]);
+const meta = ref({});
+const page = ref(1);
+const perPage = ref(15);
 const editModal = ref(null);
 const confirmDeleteModal = ref(null);
 const confirmPublishNewVersion = ref(null);
@@ -50,9 +54,18 @@ onMounted(() => {
 
 const load = () => {
   ProcessMaker.apiClient
-    .get(`/devlink/local-bundles?filter=${filter.value}`)
+    .get('/devlink/local-bundles', {
+      params: {
+        filter: filter.value,
+        page: page.value,
+        per_page: perPage.value,
+        order_by: 'created_at',
+        order_direction: 'desc',
+      }
+    })
     .then((result) => {
       bundles.value = result.data.data;
+      meta.value = result.data.meta;
       refreshKey.value++;
     });
 };
@@ -131,6 +144,7 @@ const create = () => {
   ProcessMaker.apiClient
     .post('/devlink/local-bundles', selected.value)
     .then((result) => {
+      page.value = 1;
       load();
     });
 };
@@ -197,9 +211,21 @@ const debouncedLoad = debounce(load, 300);
 
 // Function called on change
 const handleFilterChange = () => {
+  page.value = 1;
   debouncedLoad();
 };
 
+const handlePageChange = (newPage) => {
+  page.value = newPage;
+  load();
+};
+
+const handlePerPageChange = (newPerPage) => {
+  page.value = 1;
+  perPage.value = newPerPage;
+  load();
+};
+
 const canEdit = (bundle) => {
   return bundle.dev_link === null;
 }
@@ -280,9 +306,9 @@ const handleInstallationComplete = () => {
           <Origin :dev-link="data.item.dev_link"></Origin>
         </template>
         <template #cell(version)="data">
-          {{ data.item.version }} <VersionCheck 
-            :key="`version-check-${data.item.id}-${refreshKey}`" 
-            @updateAvailable="setUpdateAvailable(data.item, $event)" 
+          {{ data.item.version }} <VersionCheck
+            :key="`version-check-${data.item.id}-${refreshKey}`"
+            @updateAvailable="setUpdateAvailable(data.item, $event)"
             :dev-link="data.item">
           </VersionCheck>
         </template>
@@ -301,6 +327,12 @@ const handleInstallationComplete = () => {
         <div>{{ $t("Create a bundle to easily share assets and settings between ProcessMaker instances.") }}</div>
       </div>
     </div>
+    <pagination-table
+      :meta="meta"
+      data-cy="local-bundles-pagination"
+      @page-change="handlePageChange"
+      @per-page-change="handlePerPageChange"
+    />
   </div>
 </template>
 
diff --git a/resources/js/components/shared/AddToBundle.vue b/resources/js/components/shared/AddToBundle.vue
index d3b47dc218..c909acddcb 100644
--- a/resources/js/components/shared/AddToBundle.vue
+++ b/resources/js/components/shared/AddToBundle.vue
@@ -102,8 +102,8 @@ const save = (event) => {
 
 <template>
   <b-modal ref="modal" @ok="save"
-           :ok-title="vue.$t('Save')" 
-           cancel-variant="light" 
+           :ok-title="vue.$t('Save')"
+           cancel-variant="light"
            modal-class="add-to-bundle-modal">
     <template #modal-title>
       <b>{{ vue.$t('Add asset to bundle') }}</b>
@@ -119,7 +119,14 @@ const save = (event) => {
       </p>
       <b>{{ vue.$t('Bundles') }}</b>
       <BackendSelect
-        url="devlink/local-bundles?editable=true"
+        url="devlink/local-bundles"
+        :query-params="{
+          editable: true,
+          per_page: 100,
+          order_by: 'created_at',
+          order_direction: 'desc'
+        }"
+        :remote-search="true"
         value-field="id"
         text-field="name"
         v-model="selected"
diff --git a/resources/js/components/shared/BackendSelect.vue b/resources/js/components/shared/BackendSelect.vue
index 685e3be2e5..0c685d594a 100644
--- a/resources/js/components/shared/BackendSelect.vue
+++ b/resources/js/components/shared/BackendSelect.vue
@@ -1,9 +1,9 @@
 <script setup>
 import { defineProps, onMounted, ref, watch, defineEmits, getCurrentInstance } from 'vue';
+import debounce from 'lodash/debounce';
 
 const vue = getCurrentInstance().proxy;
 const options = ref([]);
-const value = ref(props.value);
 const emit = defineEmits(['input']);
 
 // get component props
@@ -21,27 +21,67 @@ const props = defineProps({
     required: true
   },
   value: {
-    type: Array,
-  }
+    type: [Array, Object],
+    default: null
+  },
+  queryParams: {
+    type: Object,
+    default: () => ({})
+  },
+  remoteSearch: {
+    type: Boolean,
+    default: false
+  },
 });
 
+const value = ref(props.value);
+const loading = ref(false);
 
 watch(value, () => {
   emit('input', value.value);
 });
 
-onMounted(() => {
-  window.ProcessMaker.apiClient.get(props.url).then((response) => {
+watch(() => props.value, () => {
+  value.value = props.value;
+});
+
+const loadOptions = (filter = '') => {
+  loading.value = true;
+  const params = { ...props.queryParams };
+  if (props.remoteSearch) {
+    params.filter = typeof filter === 'string' ? filter : '';
+  }
+  globalThis.ProcessMaker.apiClient.get(props.url, { params }).then((response) => {
     options.value = response.data.data;
+  }).finally(() => {
+    loading.value = false;
   });
-})
+};
+
+const debouncedLoadOptions = debounce(loadOptions, 300);
+
+const search = (filter) => {
+  if (props.remoteSearch) {
+    debouncedLoadOptions(filter);
+  }
+};
+
+onMounted(() => {
+  loadOptions();
+});
 </script>
 
 <template>
   <div>
     <multiselect v-model="value" :deselect-label="vue.$t('Can\'t remove this value')" :track-by="props.valueField" :label="props.textField"
-                 :placeholder="vue.$t('Type here to search')" :options="options" :searchable="true" :allow-empty="false" 
-                 :multiple="true">
+                 :placeholder="vue.$t('Type here to search')" :options="options" :searchable="true" :allow-empty="false"
+                 :multiple="true" :loading="loading" :internal-search="!props.remoteSearch" @open="loadOptions" @search-change="search">
+      <template slot="noResult">
+        {{ vue.$t('No elements found. Consider changing the search query.') }}
+      </template>
+      <template slot="noOptions">
+        {{ vue.$t('No Data Available') }}
+      </template>
     </multiselect>
   </div>
 </template>
diff --git a/tests/Feature/Api/DevLinkTest.php b/tests/Feature/Api/DevLinkTest.php
index 9bed587b88..0299deb6ab 100644
--- a/tests/Feature/Api/DevLinkTest.php
+++ b/tests/Feature/Api/DevLinkTest.php
@@ -23,6 +23,78 @@ public function testShowBundle()
         $this->assertEquals($bundle->id, $response->json()['id']);
     }
 
+    public function testLocalBundlesCanOrderNewestBundlesFirst()
+    {
+        $oldBundle = Bundle::factory()->create([
+            'created_at' => now()->subDays(2),
+        ]);
+        $newBundle = Bundle::factory()->create([
+            'created_at' => now(),
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.local-bundles', [
+            'order_by' => 'created_at',
+            'order_direction' => 'desc',
+        ]));
+
+        $response->assertStatus(200);
+        $this->assertEquals($newBundle->id, $response->json('data.0.id'));
+        $this->assertNotEquals($oldBundle->id, $response->json('data.0.id'));
+    }
+
+    public function testLocalBundlesCanReturnOneHundredRecords()
+    {
+        Bundle::factory()->count(101)->create();
+
+        $response = $this->apiCall('GET', route('api.devlink.local-bundles', [
+            'per_page' => 100,
+        ]));
+
+        $response->assertStatus(200);
+        $this->assertCount(100, $response->json('data'));
+        $this->assertEquals(100, $response->json('meta.per_page'));
+    }
+
+    public function testLocalBundlesFilterFindsBundleOutsideFirstPage()
+    {
+        $targetBundle = Bundle::factory()->create([
+            'name' => 'FOUR-31727 Search Target',
+            'created_at' => now()->subDays(2),
+        ]);
+        Bundle::factory()->count(15)->create([
+            'created_at' => now(),
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.local-bundles', [
+            'filter' => 'FOUR-31727 Search Target',
+        ]));
+
+        $response->assertStatus(200);
+        $this->assertEquals($targetBundle->id, $response->json('data.0.id'));
+        $this->assertCount(1, $response->json('data'));
+    }
+
+    public function testLocalBundlesEditableFilterExcludesRemoteBundles()
+    {
+        $devLink = DevLink::factory()->create();
+        $localBundle = Bundle::factory()->create([
+            'dev_link_id' => null,
+        ]);
+        $remoteBundle = Bundle::factory()->create([
+            'dev_link_id' => $devLink->id,
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.local-bundles', [
+            'editable' => true,
+            'per_page' => 100,
+        ]));
+
+        $response->assertStatus(200);
+        $bundleIds = collect($response->json('data'))->pluck('id');
+        $this->assertTrue($bundleIds->contains($localBundle->id));
+        $this->assertFalse($bundleIds->contains($remoteBundle->id));
+    }
+
     public function testAddAssets()
     {
         $screen1 = Screen::factory()->create();

From ddb7844aeadfa3775bb37982e77c16498a9f9423 Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Wed, 1 Jul 2026 08:15:20 -0600
Subject: [PATCH 02/52] FOUR-31359 Fix clipboard lookup for new users

---
 .../Api/V1_1/ClipboardController.php          |  7 ++-
 .../Api/V1_1/ClipboardControllerTest.php      | 60 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)
 create mode 100644 tests/Feature/Api/V1_1/ClipboardControllerTest.php

diff --git a/ProcessMaker/Http/Controllers/Api/V1_1/ClipboardController.php b/ProcessMaker/Http/Controllers/Api/V1_1/ClipboardController.php
index 96a62cb40a..f7bcfd7b35 100644
--- a/ProcessMaker/Http/Controllers/Api/V1_1/ClipboardController.php
+++ b/ProcessMaker/Http/Controllers/Api/V1_1/ClipboardController.php
@@ -30,7 +30,12 @@ public function show(int $clipboardId): Resource
     public function showByUserId(): Resource
     {
         $userId = Auth::id();
-        $clipboard = Clipboard::where('user_id', $userId)->firstOrFail();
+        $clipboard = Clipboard::firstOrCreate(
+            ['user_id' => $userId],
+            ['config' => [], 'type' => 'FORM']
+        );
+        // JsonResource responds with 201 for new models, but this GET should remain 200.
+        $clipboard->wasRecentlyCreated = false;
 
         return new Resource($clipboard);
     }
diff --git a/tests/Feature/Api/V1_1/ClipboardControllerTest.php b/tests/Feature/Api/V1_1/ClipboardControllerTest.php
new file mode 100644
index 0000000000..374b9b0133
--- /dev/null
+++ b/tests/Feature/Api/V1_1/ClipboardControllerTest.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Feature\Api\V1_1;
+
+use ProcessMaker\Models\Clipboard;
+use Tests\Feature\Shared\RequestHelper;
+use Tests\TestCase;
+
+class ClipboardControllerTest extends TestCase
+{
+    use RequestHelper;
+
+    public function test_get_by_user_creates_empty_clipboard_for_new_user(): void
+    {
+        Clipboard::where('user_id', $this->user->id)->delete();
+
+        $response = $this->apiCall('GET', '/api/1.1/clipboard/get_by_user');
+
+        $response->assertStatus(200)
+            ->assertJson([
+                'user_id' => $this->user->id,
+                'type' => 'FORM',
+                'config' => [],
+            ]);
+
+        $this->assertDatabaseHas('clipboards', [
+            'user_id' => $this->user->id,
+            'type' => 'FORM',
+        ]);
+        $this->assertSame(1, Clipboard::where('user_id', $this->user->id)->count());
+    }
+
+    public function test_get_by_user_returns_existing_clipboard_without_creating_duplicate(): void
+    {
+        Clipboard::where('user_id', $this->user->id)->delete();
+
+        $clipboard = Clipboard::factory()->create([
+            'user_id' => $this->user->id,
+            'config' => [
+                [
+                    'component' => 'FormInput',
+                    'config' => ['label' => 'Existing Clipboard Item'],
+                ],
+            ],
+            'type' => 'FORM',
+        ]);
+
+        $response = $this->apiCall('GET', '/api/1.1/clipboard/get_by_user');
+
+        $response->assertStatus(200)
+            ->assertJson([
+                'id' => $clipboard->id,
+                'user_id' => $this->user->id,
+                'type' => 'FORM',
+                'config' => $clipboard->config,
+            ]);
+
+        $this->assertSame(1, Clipboard::where('user_id', $this->user->id)->count());
+    }
+}

From 7614008aa8d40abeb21c1b0bf1b1160e72070f15 Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Wed, 1 Jul 2026 12:25:38 -0600
Subject: [PATCH 03/52] FOUR-31727: Stabilize remote backend select search

---
 .../js/components/shared/BackendSelect.vue    | 39 ++++++++++++++++---
 1 file changed, 33 insertions(+), 6 deletions(-)

diff --git a/resources/js/components/shared/BackendSelect.vue b/resources/js/components/shared/BackendSelect.vue
index 0c685d594a..f0cea82848 100644
--- a/resources/js/components/shared/BackendSelect.vue
+++ b/resources/js/components/shared/BackendSelect.vue
@@ -1,5 +1,5 @@
 <script setup>
-import { defineProps, onMounted, ref, watch, defineEmits, getCurrentInstance } from 'vue';
+import { defineProps, onMounted, onBeforeUnmount, ref, watch, defineEmits, getCurrentInstance } from 'vue';
 import debounce from 'lodash/debounce';
 
 const vue = getCurrentInstance().proxy;
@@ -36,6 +36,8 @@ const props = defineProps({
 
 const value = ref(props.value);
 const loading = ref(false);
+const lastSearchTerm = ref('');
+let requestSequence = 0;
 
 watch(value, () => {
   emit('input', value.value);
@@ -46,15 +48,23 @@ watch(() => props.value, () => {
 });
 
 const loadOptions = (filter = '') => {
+  const requestId = ++requestSequence;
+  const remoteFilter = typeof filter === 'string' ? filter : '';
+
   loading.value = true;
   const params = { ...props.queryParams };
   if (props.remoteSearch) {
-    params.filter = typeof filter === 'string' ? filter : '';
+    lastSearchTerm.value = remoteFilter;
+    params.filter = remoteFilter;
   }
   globalThis.ProcessMaker.apiClient.get(props.url, { params }).then((response) => {
-    options.value = response.data.data;
+    if (requestId === requestSequence) {
+      options.value = response.data.data;
+    }
   }).finally(() => {
-    loading.value = false;
+    if (requestId === requestSequence) {
+      loading.value = false;
+    }
   });
 };
 
@@ -62,20 +72,37 @@ const debouncedLoadOptions = debounce(loadOptions, 300);
 
 const search = (filter) => {
   if (props.remoteSearch) {
-    debouncedLoadOptions(filter);
+    const remoteFilter = typeof filter === 'string' ? filter : '';
+    lastSearchTerm.value = remoteFilter;
+    debouncedLoadOptions(remoteFilter);
+  }
+};
+
+const handleOpen = () => {
+  if (!props.remoteSearch) {
+    loadOptions();
+    return;
+  }
+
+  if (options.value.length === 0) {
+    loadOptions(lastSearchTerm.value);
   }
 };
 
 onMounted(() => {
   loadOptions();
 });
+
+onBeforeUnmount(() => {
+  debouncedLoadOptions.cancel();
+});
 </script>
 
 <template>
   <div>
     <multiselect v-model="value" :deselect-label="vue.$t('Can\'t remove this value')" :track-by="props.valueField" :label="props.textField"
                  :placeholder="vue.$t('Type here to search')" :options="options" :searchable="true" :allow-empty="false"
-                 :multiple="true" :loading="loading" :internal-search="!props.remoteSearch" @open="loadOptions" @search-change="search">
+                 :multiple="true" :loading="loading" :internal-search="!props.remoteSearch" @open="handleOpen" @search-change="search">
       <template slot="noResult">
         {{ vue.$t('No elements found. Consider changing the search query.') }}
       </template>

From 91c877ab069030b71cf123979fccc9e8e9520c1a Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Wed, 1 Jul 2026 13:35:06 -0600
Subject: [PATCH 04/52] FOUR-31341: Respect non-filterable task columns

---
 resources/js/tasks/components/TasksList.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/tasks/components/TasksList.vue b/resources/js/tasks/components/TasksList.vue
index aae5f56de2..33510de3a2 100644
--- a/resources/js/tasks/components/TasksList.vue
+++ b/resources/js/tasks/components/TasksList.vue
@@ -56,7 +56,7 @@
           #[`filter-${column.field}`]
         >
           <PMColumnFilterPopover
-            v-if="column.sortable"
+            v-if="column.sortable && column.filterable !== false"
             :id="'pm-table-column-' + index"
             :key="index"
             type="Field"

From eabaa2285aec2431599eb905d3f194c859262773 Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Wed, 8 Jul 2026 11:09:33 -0600
Subject: [PATCH 05/52] FOUR-30920: Remove expected DevLink ping 401

---
 .../Controllers/Api/DevLinkController.php     | 17 +++-
 .../js/admin/devlink/components/Index.vue     |  9 +-
 tests/Feature/Api/DevLinkTest.php             | 88 +++++++++++++++++++
 3 files changed, 106 insertions(+), 8 deletions(-)

diff --git a/ProcessMaker/Http/Controllers/Api/DevLinkController.php b/ProcessMaker/Http/Controllers/Api/DevLinkController.php
index 8994184d1a..c319f76f7a 100644
--- a/ProcessMaker/Http/Controllers/Api/DevLinkController.php
+++ b/ProcessMaker/Http/Controllers/Api/DevLinkController.php
@@ -3,6 +3,7 @@
 namespace ProcessMaker\Http\Controllers\Api;
 
 use Illuminate\Database\Eloquent\ModelNotFoundException;
+use Illuminate\Http\Client\RequestException;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Notification;
@@ -91,10 +92,20 @@ public function destroy(DevLink $devLink)
     public function ping(DevLink $devLink)
     {
         try {
-            return $devLink->client()->get(route('api.devlink.pong', [], false));
-        } catch (\Exception $e) {
-            return response()->json(['error' => 'DevLink connection error'], $e->getCode());
+            $response = $devLink->client()->get(route('api.devlink.pong', [], false));
+        } catch (RequestException $e) {
+            $status = $e->response->status();
+
+            return response()->json([
+                'status' => in_array($status, [401, 403], true) ? 'authorization_required' : 'error',
+            ]);
+        } catch (\Throwable $e) {
+            return response()->json(['status' => 'error']);
         }
+
+        return response()->json([
+            'status' => $response->json('status') === 'ok' ? 'ok' : 'error',
+        ]);
     }
 
     public function pong()
diff --git a/resources/js/admin/devlink/components/Index.vue b/resources/js/admin/devlink/components/Index.vue
index 3f5e0e962f..c82db806ca 100644
--- a/resources/js/admin/devlink/components/Index.vue
+++ b/resources/js/admin/devlink/components/Index.vue
@@ -101,16 +101,15 @@ const create = (name, url) => {
       ProcessMaker.apiClient
         .get(`devlink/${newId}/ping`)
         .then((response) => {
-          status.value = 'success';
-          window.location.href = fullUrl;
-        })
-        .catch((e) => {
-          if (e.response.status === 401) {
+          if (['ok', 'authorization_required'].includes(response.data.status)) {
             status.value = 'success';
             window.location.href = fullUrl;
           } else {
             status.value = 'error';
           }
+        })
+        .catch(() => {
+          status.value = 'error';
         });
     });
 };
diff --git a/tests/Feature/Api/DevLinkTest.php b/tests/Feature/Api/DevLinkTest.php
index 9bed587b88..0f96a75fe1 100644
--- a/tests/Feature/Api/DevLinkTest.php
+++ b/tests/Feature/Api/DevLinkTest.php
@@ -2,6 +2,7 @@
 
 namespace Tests\Feature\Api;
 
+use Illuminate\Http\Client\ConnectionException;
 use Illuminate\Support\Facades\Http;
 use ProcessMaker\Http\Controllers\Api\DevLinkController;
 use ProcessMaker\Models\Bundle;
@@ -43,6 +44,93 @@ public function testAddAssets()
         $this->assertEquals('Asset already exists in bundle', $response->json()['error']['message']);
     }
 
+    public function testPingReturnsOkWhenRemotePongSucceeds()
+    {
+        $devLink = DevLink::factory()->create([
+            'url' => 'https://remote-instance.test',
+            'access_token' => 'token',
+        ]);
+
+        Http::fake([
+            'remote-instance.test/*' => Http::response(['status' => 'ok'], 200),
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.ping', ['devLink' => $devLink->id]));
+
+        $response->assertStatus(200);
+        $response->assertJson(['status' => 'ok']);
+    }
+
+    public function testPingReturnsAuthorizationRequiredWhenRemotePongReturnsUnauthorized()
+    {
+        $devLink = DevLink::factory()->create([
+            'url' => 'https://remote-instance.test',
+            'access_token' => 'token',
+        ]);
+
+        Http::fake([
+            'remote-instance.test/*' => Http::response(['message' => 'Unauthorized'], 401),
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.ping', ['devLink' => $devLink->id]));
+
+        $response->assertStatus(200);
+        $response->assertJson(['status' => 'authorization_required']);
+    }
+
+    public function testPingReturnsAuthorizationRequiredWhenRemotePongReturnsForbidden()
+    {
+        $devLink = DevLink::factory()->create([
+            'url' => 'https://remote-instance.test',
+            'access_token' => 'token',
+        ]);
+
+        Http::fake([
+            'remote-instance.test/*' => Http::response(['message' => 'Forbidden'], 403),
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.ping', ['devLink' => $devLink->id]));
+
+        $response->assertStatus(200);
+        $response->assertJson(['status' => 'authorization_required']);
+    }
+
+    public function testPingReturnsErrorWhenRemotePongFails()
+    {
+        $devLink = DevLink::factory()->create([
+            'url' => 'https://remote-instance.test',
+            'access_token' => 'token',
+        ]);
+
+        Http::fake([
+            'remote-instance.test/*' => Http::response(['message' => 'Server error'], 500),
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.ping', ['devLink' => $devLink->id]));
+
+        $response->assertStatus(200);
+        $response->assertJson(['status' => 'error']);
+    }
+
+    public function testPingReturnsErrorWhenRemotePongCannotConnect()
+    {
+        $devLink = DevLink::factory()->create([
+            'url' => 'https://remote-instance.test',
+            'access_token' => 'token',
+        ]);
+
+        Http::fake([
+            'remote-instance.test/*' => function () {
+                throw new ConnectionException('Connection failed');
+            },
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.ping', ['devLink' => $devLink->id]));
+
+        $response->assertStatus(200);
+        $response->assertJson(['status' => 'error']);
+    }
+
     public function testInstallRemoteAsset()
     {
         $screen = Screen::factory()->create();

From 1a0e084bababd6a9b7d2b4c92106dc744e771aca Mon Sep 17 00:00:00 2001
From: Miguel Angel <miguelangeldev@icloud.com>
Date: Wed, 10 Sep 2025 15:21:01 -0400
Subject: [PATCH 06/52] feat: add saved_search_advanced_configuration to
 filesystem configuration

---
 .gitignore             | 1 +
 config/filesystems.php | 7 +++++++
 2 files changed, 8 insertions(+)

diff --git a/.gitignore b/.gitignore
index 7a47d39bab..8d89feb4b6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -34,6 +34,7 @@ storage/ssl
 storage/api/*
 storage/data-sources/logs/*
 storage/decision-tables/*
+storage/saved_search_advanced_configuration/*
 npm.sh
 laravel-echo-server.lock
 public/.htaccess
diff --git a/config/filesystems.php b/config/filesystems.php
index 809b4718f7..3fa45d5637 100644
--- a/config/filesystems.php
+++ b/config/filesystems.php
@@ -136,6 +136,13 @@
         // Others declared in packages
         // - translations - package-translations
         // - 'filesystems.disks.install' configured on the fly
+
+        'saved_search_advanced_configuration' => [
+            'driver' => 'local',
+            'root' => storage_path('saved_search_advanced_configuration'),
+            'url' => env('APP_URL') . '/storage/saved_search_advanced_configuration',
+            'visibility' => 'private',
+        ],
     ],
 
     /*

From 2445e0ca004042a348fb174a2612ef3c70dd72fd Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Tue, 16 Sep 2025 18:31:15 -0400
Subject: [PATCH 07/52] Add job validation and new scheduling method
 `scheduleDateJob`

---
 .../Managers/TaskSchedulerManager.php         | 31 +++++++++++++++++++
 1 file changed, 31 insertions(+)

diff --git a/ProcessMaker/Managers/TaskSchedulerManager.php b/ProcessMaker/Managers/TaskSchedulerManager.php
index 10e26e4fd4..af9bde3e9b 100644
--- a/ProcessMaker/Managers/TaskSchedulerManager.php
+++ b/ProcessMaker/Managers/TaskSchedulerManager.php
@@ -13,6 +13,7 @@
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\Str;
+use InvalidArgumentException;
 use PDOException;
 use ProcessMaker\Facades\WorkflowManager;
 use ProcessMaker\Jobs\StartEventConditional;
@@ -888,6 +889,9 @@ public function scheduleCycle(
      */
     public function scheduleCycleJob($interval, array $config): ScheduledTask
     {
+        if (!isset($config['job'])) {
+            throw new InvalidArgumentException('$config["job"] is required');
+        }
         $configuration = [
             'type' => 'TimeCycle',
             'interval' => $interval,
@@ -904,6 +908,33 @@ public function scheduleCycleJob($interval, array $config): ScheduledTask
         return $scheduledTask;
     }
 
+    /**
+     * Schedule a job for a specific datetime
+     *
+     * @param string $datetime in ISO-8601 format
+     * @param array $config configuration
+     *
+     * @return ScheduledTask
+     */
+    public function scheduleDateJob($datetime, array $config): ScheduledTask
+    {
+        if (!isset($config['job'])) {
+            throw new InvalidArgumentException('$config["job"] is required');
+        }
+        $configuration = [
+            'type' => 'TimeDate',
+            'date' => $datetime,
+            ...$config,
+        ];
+        $scheduledTask = new ScheduledTask();
+        $scheduledTask->configuration = json_encode($configuration);
+        $scheduledTask->type = 'SCHEDULED_JOB';
+        $scheduledTask->last_execution = null;
+        $scheduledTask->save();
+
+        return $scheduledTask;
+    }
+
     /**
      * Schedule a job execution after a time duration for the given BPMN element,
      * event definition and an optional Token object

From 4f14492daf75b302c68d1e866f6a949e02dd537f Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Thu, 9 Jul 2026 12:19:44 -0400
Subject: [PATCH 08/52] Bumped tag branch perfomance

---
 composer.json | 4 ++--
 package.json  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 27aa31c9d9..b291c6de15 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "2026.12.1",
+    "version": "2026.12.1-FOUR-26166",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
@@ -178,7 +178,7 @@
                 "package-product-analytics": "1.5.11",
                 "package-projects": "1.12.9",
                 "package-rpa": "1.1.2",
-                "package-savedsearch": "1.43.14",
+                "package-savedsearch": "dev-feature/FOUR-26166",
                 "package-slideshow": "1.4.3",
                 "package-smart-extract": "1.0.0",
                 "package-signature": "1.15.6",
diff --git a/package.json b/package.json
index dc8db21e4c..cb79f03d2a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@processmaker/processmaker",
-    "version": "2026.12.1",
+    "version": "2026.12.1-FOUR-26166",
     "description": "ProcessMaker 4",
     "author": "DevOps <devops@processmaker.com>",
     "license": "ISC",

From 0c7a58cb48ee843e8a121fab61b71ff34cc8354d Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Thu, 9 Jul 2026 12:12:21 -0600
Subject: [PATCH 09/52] FOUR-29372: Show persisted multi-instance form data

---
 .../Api/ProcessRequestController.php          |  2 +-
 tests/Feature/Api/ProcessRequestsTest.php     | 65 +++++++++++++++++++
 2 files changed, 66 insertions(+), 1 deletion(-)

diff --git a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
index 15746d08cd..0a4daa0991 100644
--- a/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
+++ b/ProcessMaker/Http/Controllers/Api/ProcessRequestController.php
@@ -792,7 +792,7 @@ public function getRequestToken(Request $httpRequest, ProcessRequest $request)
     public function screenRequested(Request $httpRequest, ProcessRequest $request)
     {
         $query = ProcessRequestToken::query();
-        $query->select('id', 'element_id', 'process_id', 'process_request_id', 'data')
+        $query->select('id', 'element_id', 'process_id', 'process_request_id', 'data', 'token_properties')
             ->where('process_request_id', $request->id)
             ->whereNotIn('element_type', ['end_event', 'scriptTask'])
             ->whereIn('status', ['CLOSED', 'TRIGGERED'])
diff --git a/tests/Feature/Api/ProcessRequestsTest.php b/tests/Feature/Api/ProcessRequestsTest.php
index 930805cead..1556b07c90 100644
--- a/tests/Feature/Api/ProcessRequestsTest.php
+++ b/tests/Feature/Api/ProcessRequestsTest.php
@@ -14,6 +14,7 @@
 use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestToken;
+use ProcessMaker\Models\Screen;
 use ProcessMaker\Models\User;
 use ProcessMaker\Nayra\Contracts\Bpmn\ActivityInterface;
 use Tests\Feature\Shared\RequestHelper;
@@ -1133,6 +1134,70 @@ public function testScreenRequested()
         $this->assertEmpty($data);
     }
 
+    public function testScreenRequestedReturnsMultiInstanceTokenPropertiesData()
+    {
+        $screen = Screen::factory()->create([
+            'config' => [[
+                'component' => 'FormTextArea',
+                'config' => [
+                    'label' => 'New Textarea',
+                    'name' => 'form_text_area_1',
+                ],
+            ]],
+        ]);
+        $bpmn = file_get_contents(base_path('tests/Feature/Api/processes/Timer_BoundaryEvent_MultiInstance.bpmn'));
+        $bpmn = str_replace('pm:screenRef="19"', 'pm:screenRef="' . $screen->id . '"', $bpmn);
+        $process = Process::factory()->create([
+            'bpmn' => $bpmn,
+            'user_id' => $this->user->id,
+        ]);
+        $request = ProcessRequest::factory()->create([
+            'process_id' => $process->id,
+            'process_version_id' => $process->getLatestVersion()->id,
+            'callable_id' => 'ProcessId',
+            'data' => [
+                'array' => [
+                    ['form_input_1' => 'lulu1'],
+                ],
+            ],
+        ]);
+
+        ProcessRequestToken::factory()->create([
+            'process_id' => $process->id,
+            'process_request_id' => $request->id,
+            'element_id' => 'node_2',
+            'element_type' => 'task',
+            'status' => 'CLOSED',
+            'data' => [
+                'loopCounter' => 1,
+                'form_input_1' => 'lulu1',
+                'form_text_area_1' => 'lorem ipsum',
+            ],
+            'token_properties' => [
+                'data' => [
+                    'loopCounter' => 1,
+                    'form_input_1' => 'lulu1',
+                    'form_text_area_1' => 'lorem ipsum',
+                ],
+            ],
+        ]);
+
+        $route = route('api.requests.detail.screen', ['request' => $request->id]);
+        $response = $this->apiCall('GET', $route, [
+            'page' => 1,
+            'per_page' => 10,
+            'order_by' => 'completed_at',
+            'order_direction' => 'asc',
+            'filter' => '',
+        ]);
+
+        $response->assertStatus(200);
+        $data = $response->json('data');
+        $this->assertCount(1, $data);
+        $this->assertSame('lorem ipsum', $data[0]['data']['form_text_area_1']);
+        $this->assertSame('lorem ipsum', $data[0]['data']['_parent']['form_text_area_1']);
+    }
+
     /**
      * Get a list of Requests by Cases.
      */

From ea35fe0015835d02a2f0d8f4b5c1cb93c6906fda Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Thu, 9 Jul 2026 14:45:56 -0400
Subject: [PATCH 10/52] Fixing issue composer version

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b291c6de15..c0204a9e1a 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "2026.12.1-FOUR-26166",
+    "version": "2026.12.1-26166",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"

From 880cdbf3d71f884ebff867e516d9eb5838659e83 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Thu, 9 Jul 2026 14:47:03 -0400
Subject: [PATCH 11/52] Fixing issue composer version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index cb79f03d2a..bc3c0e44fd 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@processmaker/processmaker",
-    "version": "2026.12.1-FOUR-26166",
+    "version": "2026.12.1-26166",
     "description": "ProcessMaker 4",
     "author": "DevOps <devops@processmaker.com>",
     "license": "ISC",

From ed93d732115e047942e375f327460b6a809bab9f Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Thu, 9 Jul 2026 14:52:12 -0400
Subject: [PATCH 12/52] Fixing issue composer version

---
 composer.json | 2 +-
 package.json  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index c0204a9e1a..234686ee80 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "2026.12.1-26166",
+    "version": "2026.12.1+26166",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
diff --git a/package.json b/package.json
index bc3c0e44fd..75b35fb880 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@processmaker/processmaker",
-    "version": "2026.12.1-26166",
+    "version": "2026.12.1+26166",
     "description": "ProcessMaker 4",
     "author": "DevOps <devops@processmaker.com>",
     "license": "ISC",

From d099c018524e22b16b97395eaad4af654bf23536 Mon Sep 17 00:00:00 2001
From: sanja <52755494+sanjacornelius@users.noreply.github.com>
Date: Thu, 9 Jul 2026 13:02:38 -0700
Subject: [PATCH 13/52] Add Microsoft Graph token provider and tests

Introduce MicrosoftGraphTokenProvider to obtain and cache OAuth2 client-credentials tokens from Microsoft Graph. The provider validates required credentials, posts to the tenant token endpoint via Guzzle, throws a RuntimeException on missing creds or HTTP errors (propagating server error messages), and caches the access token for ~50 minutes using a server-specific cache key. Includes unit tests that assert exception behavior for missing credentials and mock Guzzle to verify token request parameters and caching behavior.
---
 .../Mail/MicrosoftGraphTokenProvider.php      | 61 ++++++++++++++++
 .../Mail/MicrosoftGraphTokenProviderTest.php  | 73 +++++++++++++++++++
 2 files changed, 134 insertions(+)
 create mode 100644 ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
 create mode 100644 tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php

diff --git a/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php b/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
new file mode 100644
index 0000000000..1926107806
--- /dev/null
+++ b/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
@@ -0,0 +1,61 @@
+<?php
+
+namespace ProcessMaker\Mail;
+
+use GuzzleHttp\Client;
+use Illuminate\Support\Facades\Cache;
+use RuntimeException;
+
+class MicrosoftGraphTokenProvider
+{
+    private const TOKEN_URL = 'https://login.microsoftonline.com/%s/oauth2/v2.0/token';
+
+    private const DEFAULT_SCOPE = 'https://graph.microsoft.com/.default';
+
+    public function __construct(
+        private array $config,
+        private int|string $serverIndex = 0
+    ) {
+    }
+
+    public function getAccessToken(): string
+    {
+        $cacheKey = 'microsoft_graph_access_token_' . ($this->serverIndex ?: 'default');
+
+        return Cache::remember($cacheKey, now()->addMinutes(50), function () {
+            return $this->requestAccessToken();
+        });
+    }
+
+    private function requestAccessToken(): string
+    {
+        $tenantId = $this->config['tenant_id'] ?? null;
+        $clientId = $this->config['key'] ?? null;
+        $clientSecret = $this->config['secret'] ?? null;
+
+        if (!$tenantId || !$clientId || !$clientSecret) {
+            throw new RuntimeException('Microsoft Graph credentials are not configured.');
+        }
+
+        $client = new Client();
+        $response = $client->post(sprintf(self::TOKEN_URL, $tenantId), [
+            'form_params' => [
+                'client_id' => $clientId,
+                'client_secret' => $clientSecret,
+                'scope' => self::DEFAULT_SCOPE,
+                'grant_type' => 'client_credentials',
+            ],
+            'http_errors' => false,
+        ]);
+
+        $body = json_decode($response->getBody()->getContents(), true);
+
+        if ($response->getStatusCode() >= 400) {
+            $message = $body['error_description'] ?? $body['error']['message'] ?? 'Unknown error';
+
+            throw new RuntimeException('Failed to get Microsoft Graph access token: ' . $message);
+        }
+
+        return $body['access_token'];
+    }
+}
diff --git a/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php b/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
new file mode 100644
index 0000000000..51f434b75e
--- /dev/null
+++ b/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
@@ -0,0 +1,73 @@
+<?php
+
+namespace Tests\Unit\ProcessMaker\Mail;
+
+use Illuminate\Support\Facades\Cache;
+use Mockery;
+use ProcessMaker\Mail\MicrosoftGraphTokenProvider;
+use RuntimeException;
+use Tests\TestCase;
+
+/**
+ * @runTestsInSeparateProcesses
+ * @preserveGlobalState disabled
+ */
+class MicrosoftGraphTokenProviderTest extends TestCase
+{
+    protected function tearDown(): void
+    {
+        Mockery::close();
+        parent::tearDown();
+    }
+
+    public function testGetAccessTokenThrowsWhenCredentialsAreMissing()
+    {
+        $provider = new MicrosoftGraphTokenProvider([
+            'tenant_id' => '',
+            'key' => 'client-id',
+            'secret' => 'client-secret',
+        ]);
+
+        $this->expectException(RuntimeException::class);
+        $this->expectExceptionMessage('Microsoft Graph credentials are not configured.');
+
+        $provider->getAccessToken();
+    }
+
+    public function testGetAccessTokenRequestsTokenFromMicrosoft()
+    {
+        Cache::flush();
+
+        $tokenResponseBody = Mockery::mock();
+        $tokenResponseBody->shouldReceive('getContents')
+            ->andReturn(json_encode(['access_token' => 'token-from-azure']));
+
+        $tokenResponse = Mockery::mock();
+        $tokenResponse->shouldReceive('getStatusCode')->andReturn(200);
+        $tokenResponse->shouldReceive('getBody')->andReturn($tokenResponseBody);
+
+        $guzzle = Mockery::mock('overload:GuzzleHttp\Client');
+        $guzzle->shouldReceive('post')
+            ->once()
+            ->with(
+                'https://login.microsoftonline.com/tenant-id-123/oauth2/v2.0/token',
+                Mockery::on(function ($options) {
+                    return $options['form_params']['client_id'] === 'client-id-123'
+                        && $options['form_params']['client_secret'] === 'client-secret-123'
+                        && $options['form_params']['scope'] === 'https://graph.microsoft.com/.default'
+                        && $options['form_params']['grant_type'] === 'client_credentials'
+                        && $options['http_errors'] === false;
+                })
+            )
+            ->andReturn($tokenResponse);
+
+        $provider = new MicrosoftGraphTokenProvider([
+            'tenant_id' => 'tenant-id-123',
+            'key' => 'client-id-123',
+            'secret' => 'client-secret-123',
+        ], 1);
+
+        $this->assertSame('token-from-azure', $provider->getAccessToken());
+        $this->assertSame('token-from-azure', $provider->getAccessToken());
+    }
+}

From 727173822d1bef83180ce54ed754d4127c07ba87 Mon Sep 17 00:00:00 2001
From: sanja <52755494+sanjacornelius@users.noreply.github.com>
Date: Thu, 9 Jul 2026 14:37:21 -0700
Subject: [PATCH 14/52] Inject HTTP client into token provider

Add an optional Guzzle Client dependency to MicrosoftGraphTokenProvider so an HTTP client can be injected for testing. The constructor now accepts ?Client $httpClient and the provider uses $this->httpClient ?? new Client() when posting for tokens. Update the unit test to mock GuzzleHttp\Client (remove overload-based mock and separate-process annotations), import Client, and pass the mocked client into the provider. This enables dependency injection and simpler, more reliable tests.
---
 ProcessMaker/Mail/MicrosoftGraphTokenProvider.php        | 5 +++--
 .../Mail/MicrosoftGraphTokenProviderTest.php             | 9 +++------
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php b/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
index 1926107806..913274bea6 100644
--- a/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
+++ b/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
@@ -14,7 +14,8 @@ class MicrosoftGraphTokenProvider
 
     public function __construct(
         private array $config,
-        private int|string $serverIndex = 0
+        private int|string $serverIndex = 0,
+        private ?Client $httpClient = null,
     ) {
     }
 
@@ -37,7 +38,7 @@ private function requestAccessToken(): string
             throw new RuntimeException('Microsoft Graph credentials are not configured.');
         }
 
-        $client = new Client();
+        $client = $this->httpClient ?? new Client();
         $response = $client->post(sprintf(self::TOKEN_URL, $tenantId), [
             'form_params' => [
                 'client_id' => $clientId,
diff --git a/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php b/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
index 51f434b75e..4c5870934b 100644
--- a/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
+++ b/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
@@ -2,16 +2,13 @@
 
 namespace Tests\Unit\ProcessMaker\Mail;
 
+use GuzzleHttp\Client;
 use Illuminate\Support\Facades\Cache;
 use Mockery;
 use ProcessMaker\Mail\MicrosoftGraphTokenProvider;
 use RuntimeException;
 use Tests\TestCase;
 
-/**
- * @runTestsInSeparateProcesses
- * @preserveGlobalState disabled
- */
 class MicrosoftGraphTokenProviderTest extends TestCase
 {
     protected function tearDown(): void
@@ -46,7 +43,7 @@ public function testGetAccessTokenRequestsTokenFromMicrosoft()
         $tokenResponse->shouldReceive('getStatusCode')->andReturn(200);
         $tokenResponse->shouldReceive('getBody')->andReturn($tokenResponseBody);
 
-        $guzzle = Mockery::mock('overload:GuzzleHttp\Client');
+        $guzzle = Mockery::mock(Client::class);
         $guzzle->shouldReceive('post')
             ->once()
             ->with(
@@ -65,7 +62,7 @@ public function testGetAccessTokenRequestsTokenFromMicrosoft()
             'tenant_id' => 'tenant-id-123',
             'key' => 'client-id-123',
             'secret' => 'client-secret-123',
-        ], 1);
+        ], 1, $guzzle);
 
         $this->assertSame('token-from-azure', $provider->getAccessToken());
         $this->assertSame('token-from-azure', $provider->getAccessToken());

From f621ec40f11cbeb98c1be577345e94a2b52204f2 Mon Sep 17 00:00:00 2001
From: Miguel Angel <miguelangeldev@icloud.com>
Date: Fri, 10 Jul 2026 13:35:41 -0400
Subject: [PATCH 15/52] feat: fix TaskSchedulerManager to handle last_execution
 initialization and update configuration structure for scheduled jobs

---
 ProcessMaker/Managers/TaskSchedulerManager.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/ProcessMaker/Managers/TaskSchedulerManager.php b/ProcessMaker/Managers/TaskSchedulerManager.php
index af9bde3e9b..a158118e37 100644
--- a/ProcessMaker/Managers/TaskSchedulerManager.php
+++ b/ProcessMaker/Managers/TaskSchedulerManager.php
@@ -204,10 +204,11 @@ private function processTaskWithAtomicClaim(ScheduledTask $task, DateTime $today
     {
         try {
             $config = json_decode($task->configuration);
-            $lastExecution = new DateTime($task->last_execution, new DateTimeZone('UTC'));
 
-            if ($lastExecution === null) {
-                return;
+            // SCHEDULED_JOB rows use last_execution = null until first run; BPMN timers always set last_execution.
+            $lastExecution = null;
+            if ($task->last_execution !== null && $task->last_execution !== '') {
+                $lastExecution = new DateTime($task->last_execution, new DateTimeZone('UTC'));
             }
 
             $owner = $task->processRequestToken ?: $task->processRequest ?: $task->process;
@@ -921,11 +922,14 @@ public function scheduleDateJob($datetime, array $config): ScheduledTask
         if (!isset($config['job'])) {
             throw new InvalidArgumentException('$config["job"] is required');
         }
+
+        // Must use "interval" so nextDate(TimeDate) picks up the target datetime (same shape as BPMN timer tasks).
         $configuration = [
             'type' => 'TimeDate',
-            'date' => $datetime,
             ...$config,
+            'interval' => $datetime,
         ];
+
         $scheduledTask = new ScheduledTask();
         $scheduledTask->configuration = json_encode($configuration);
         $scheduledTask->type = 'SCHEDULED_JOB';

From b0d14ca501733e5af85d67b9b7f925ebdf62e8b3 Mon Sep 17 00:00:00 2001
From: sanja <52755494+sanjacornelius@users.noreply.github.com>
Date: Fri, 10 Jul 2026 14:40:11 -0700
Subject: [PATCH 16/52] Use real PSR-7 Response in test

Replace Mockery-based response mocks in MicrosoftGraphTokenProviderTest with an actual GuzzleHttp\Psr7\Response instance. Simplifies the test by providing a real PSR-7 response (200) with a JSON body and removes the need to mock getBody()/getContents() and getStatusCode(). Added the Response use statement.
---
 .../Mail/MicrosoftGraphTokenProviderTest.php             | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php b/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
index 4c5870934b..a4f62d67d5 100644
--- a/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
+++ b/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Unit\ProcessMaker\Mail;
 
 use GuzzleHttp\Client;
+use GuzzleHttp\Psr7\Response;
 use Illuminate\Support\Facades\Cache;
 use Mockery;
 use ProcessMaker\Mail\MicrosoftGraphTokenProvider;
@@ -35,13 +36,7 @@ public function testGetAccessTokenRequestsTokenFromMicrosoft()
     {
         Cache::flush();
 
-        $tokenResponseBody = Mockery::mock();
-        $tokenResponseBody->shouldReceive('getContents')
-            ->andReturn(json_encode(['access_token' => 'token-from-azure']));
-
-        $tokenResponse = Mockery::mock();
-        $tokenResponse->shouldReceive('getStatusCode')->andReturn(200);
-        $tokenResponse->shouldReceive('getBody')->andReturn($tokenResponseBody);
+        $tokenResponse = new Response(200, [], json_encode(['access_token' => 'token-from-azure']));
 
         $guzzle = Mockery::mock(Client::class);
         $guzzle->shouldReceive('post')

From a8f92f6818220b30498f3b184a2321d501cfa327 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Mon, 13 Jul 2026 14:59:21 -0400
Subject: [PATCH 17/52] FOUR-27170

---
 ...d_at_to_notifications_notifiable_index.php | 48 +++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 database/migrations/2026_07_13_145000_add_created_at_to_notifications_notifiable_index.php

diff --git a/database/migrations/2026_07_13_145000_add_created_at_to_notifications_notifiable_index.php b/database/migrations/2026_07_13_145000_add_created_at_to_notifications_notifiable_index.php
new file mode 100644
index 0000000000..9245d4c0f9
--- /dev/null
+++ b/database/migrations/2026_07_13_145000_add_created_at_to_notifications_notifiable_index.php
@@ -0,0 +1,48 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    private const TABLE = 'notifications';
+
+    private const INDEX_NAME = 'notifications_notifiable_type_notifiable_id_read_at_index';
+
+    /**
+     * Run the migrations.
+     *
+     * Prefer running during a low-workload window. Creating this index on a large
+     * notifications table can acquire locks and briefly affect write throughput.
+     */
+    public function up(): void
+    {
+        // Replace the previous 3-column index with an extended one that includes
+        // created_at DESC. Same index name is reused intentionally.
+        if (Schema::hasIndex(self::TABLE, self::INDEX_NAME)) {
+            Schema::table(self::TABLE, function (Blueprint $table) {
+                $table->dropIndex(self::INDEX_NAME);
+            });
+        }
+
+        if (!Schema::hasIndex(self::TABLE, self::INDEX_NAME)) {
+            DB::statement(
+                'CREATE INDEX ' . self::INDEX_NAME . ' ON ' . self::TABLE
+                . ' (notifiable_type, notifiable_id, read_at, created_at DESC)'
+            );
+        }
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        if (Schema::hasIndex(self::TABLE, self::INDEX_NAME)) {
+            Schema::table(self::TABLE, function (Blueprint $table) {
+                $table->dropIndex(self::INDEX_NAME);
+            });
+        }
+    }
+};

From 79347af0eac2e72941ce58c0067da34c44ae75eb Mon Sep 17 00:00:00 2001
From: sanja <52755494+sanjacornelius@users.noreply.github.com>
Date: Tue, 14 Jul 2026 15:46:27 -0700
Subject: [PATCH 18/52] Add Microsoft Graph mail transport and config

Introduce Microsoft Graph mail support: add MicrosoftGraphTransport and MicrosoftGraphMessageConverter to send emails via the Graph API and a MicrosoftGraphTokenProvider to obtain access tokens. Integrate the transport into OauthMailManager (createTransport/createMicrosoftGraphTransport) and register a 'microsoft_graph' mailer in config/mail.php. Update the admin settings UI to show the authorization button when the mail driver is set to 'microsoft_graph'. The transport posts a sendMail payload to the Graph endpoint and throws a TransportException on HTTP errors.
---
 .../Mail/MicrosoftGraphMessageConverter.php   | 55 +++++++++++++++++++
 .../Mail/MicrosoftGraphTokenProvider.php      |  2 +-
 .../Transports/MicrosoftGraphTransport.php    | 53 ++++++++++++++++++
 ProcessMaker/Managers/OauthMailManager.php    | 22 ++++++++
 config/mail.php                               |  4 ++
 .../settings/components/SettingsListing.vue   |  4 +-
 6 files changed, 138 insertions(+), 2 deletions(-)
 create mode 100644 ProcessMaker/Mail/MicrosoftGraphMessageConverter.php
 create mode 100644 ProcessMaker/Mail/Transports/MicrosoftGraphTransport.php

diff --git a/ProcessMaker/Mail/MicrosoftGraphMessageConverter.php b/ProcessMaker/Mail/MicrosoftGraphMessageConverter.php
new file mode 100644
index 0000000000..e95a3ea281
--- /dev/null
+++ b/ProcessMaker/Mail/MicrosoftGraphMessageConverter.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace ProcessMaker\Mail;
+
+use Symfony\Component\Mime\Address;
+use Symfony\Component\Mime\Email;
+
+class MicrosoftGraphMessageConverter
+{
+    public static function toSendMailPayload(Email $email): array
+    {
+        $htmlBody = $email->getHtmlBody();
+        $textBody = $email->getTextBody();
+
+        $message = [
+            'subject' => $email->getSubject() ?? '',
+            'body' => [
+                'contentType' => $htmlBody !== null ? 'HTML' : 'Text',
+                'content' => $htmlBody ?? $textBody ?? '',
+            ],
+            'toRecipients' => self::convertAddresses($email->getTo()),
+        ];
+
+        $ccRecipients = self::convertAddresses($email->getCc());
+        if ($ccRecipients) {
+            $message['ccRecipients'] = $ccRecipients;
+        }
+
+        $bccRecipients = self::convertAddresses($email->getBcc());
+        if ($bccRecipients) {
+            $message['bccRecipients'] = $bccRecipients;
+        }
+
+        return [
+            'message' => $message,
+            'saveToSentItems' => true,
+        ];
+    }
+
+    /**
+     * @param  Address[]  $addresses
+     */
+    private static function convertAddresses(array $addresses): array
+    {
+        return array_map(function (Address $address) {
+            $emailAddress = ['address' => $address->getAddress()];
+
+            if ($address->getName()) {
+                $emailAddress['name'] = $address->getName();
+            }
+
+            return ['emailAddress' => $emailAddress];
+        }, $addresses);
+    }
+}
diff --git a/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php b/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
index 913274bea6..1b97e5af05 100644
--- a/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
+++ b/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
@@ -15,7 +15,7 @@ class MicrosoftGraphTokenProvider
     public function __construct(
         private array $config,
         private int|string $serverIndex = 0,
-        private ?Client $httpClient = null,
+        private ?Client $httpClient = null
     ) {
     }
 
diff --git a/ProcessMaker/Mail/Transports/MicrosoftGraphTransport.php b/ProcessMaker/Mail/Transports/MicrosoftGraphTransport.php
new file mode 100644
index 0000000000..59ff0d1b96
--- /dev/null
+++ b/ProcessMaker/Mail/Transports/MicrosoftGraphTransport.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace ProcessMaker\Mail\Transports;
+
+use GuzzleHttp\Client;
+use ProcessMaker\Mail\MicrosoftGraphMessageConverter;
+use ProcessMaker\Mail\MicrosoftGraphTokenProvider;
+use Symfony\Component\Mailer\Exception\TransportException;
+use Symfony\Component\Mailer\SentMessage;
+use Symfony\Component\Mailer\Transport\AbstractTransport;
+use Symfony\Component\Mime\MessageConverter;
+
+class MicrosoftGraphTransport extends AbstractTransport
+{
+    public function __construct(
+        private MicrosoftGraphTokenProvider $tokenProvider,
+        private string $senderEmail,
+        private ?Client $client = null
+    ) {
+        parent::__construct();
+
+        $this->client = $client ?? new Client([
+            'base_uri' => 'https://graph.microsoft.com/v1.0/',
+        ]);
+    }
+
+    protected function doSend(SentMessage $message): void
+    {
+        $email = MessageConverter::toEmail($message->getOriginalMessage());
+        $payload = MicrosoftGraphMessageConverter::toSendMailPayload($email);
+        $token = $this->tokenProvider->getAccessToken();
+
+        $response = $this->client->post('users/' . rawurlencode($this->senderEmail) . '/sendMail', [
+            'headers' => [
+                'Authorization' => 'Bearer ' . $token,
+                'Content-Type' => 'application/json',
+            ],
+            'json' => $payload,
+            'http_errors' => false,
+        ]);
+
+        if ($response->getStatusCode() >= 400) {
+            throw new TransportException(
+                'Microsoft Graph send failed: ' . $response->getBody()->getContents()
+            );
+        }
+    }
+
+    public function __toString(): string
+    {
+        return 'microsoft-graph';
+    }
+}
diff --git a/ProcessMaker/Managers/OauthMailManager.php b/ProcessMaker/Managers/OauthMailManager.php
index 603b174970..58a7d08b12 100644
--- a/ProcessMaker/Managers/OauthMailManager.php
+++ b/ProcessMaker/Managers/OauthMailManager.php
@@ -7,6 +7,8 @@
 use Google\Client as GoogleClient;
 use GuzzleHttp\Client;
 use Illuminate\Mail\MailManager;
+use ProcessMaker\Mail\MicrosoftGraphTokenProvider;
+use ProcessMaker\Mail\Transports\MicrosoftGraphTransport;
 use ProcessMaker\Models\EnvironmentVariable;
 use ProcessMaker\Models\Setting;
 use ProcessMaker\Packages\Connectors\Email\EmailConfig;
@@ -77,6 +79,26 @@ protected function createSmtpTransport($config)
         return $transport;
     }
 
+    public function createTransport(array $config)
+    {
+        if ($this->app->config->get('mail.driver') === 'microsoft_graph') {
+            return $this->createMicrosoftGraphTransport($config);
+        }
+
+        return parent::createTransport($config);
+    }
+
+    protected function createMicrosoftGraphTransport(array $config)
+    {
+        return new MicrosoftGraphTransport(
+            new MicrosoftGraphTokenProvider(
+                $this->app->config->get('services.microsoft_graph', []),
+                $this->emailServerIndex ?? 0
+            ),
+            $this->fromAddress
+        );
+    }
+
     public function checkForExpiredAccessToken()
     {
         switch ($this->authMethod) {
diff --git a/config/mail.php b/config/mail.php
index d78ea38d62..1b524c46c7 100644
--- a/config/mail.php
+++ b/config/mail.php
@@ -86,6 +86,10 @@
             'transport' => 'array',
         ],
 
+        'microsoft_graph' => [
+            'transport' => 'microsoft_graph',
+        ],
+
         'failover' => [
             'transport' => 'failover',
             'mailers' => [
diff --git a/resources/js/admin/settings/components/SettingsListing.vue b/resources/js/admin/settings/components/SettingsListing.vue
index ecba515d51..01a3ae7e30 100644
--- a/resources/js/admin/settings/components/SettingsListing.vue
+++ b/resources/js/admin/settings/components/SettingsListing.vue
@@ -607,7 +607,9 @@ export default {
     filterEmailServerButtons(groupName, groupData, btn) {
       const authMethod = groupData.find(data => data.key.includes("EMAIL_CONNECTOR_MAIL_AUTH_METHOD"));
       const selectedAuthMethod = authMethod ? authMethod.ui.options[authMethod.config] : null;
-      const showAuthAccBtn = selectedAuthMethod && selectedAuthMethod !== 'standard' ? true : false;
+      const mailDriver = groupData.find(data => data.key.includes("EMAIL_CONNECTOR_MAIL_DRIVER"));
+      const selectedDriver = mailDriver ? mailDriver.ui.options[mailDriver.config] : null;
+      const showAuthAccBtn = (selectedAuthMethod && selectedAuthMethod !== 'standard') || selectedDriver === 'microsoft_graph';
 
       if (groupName.includes('Email Server') && !showAuthAccBtn)  {
         // Returns all 'top' position buttons except the '+ Mail Server' and 'Authorize Account' button for email server tabs

From 0bfa4d5d4129ec9845ed5a7f35f35be136877b37 Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Wed, 15 Jul 2026 09:54:37 -0600
Subject: [PATCH 19/52] FOUR-32268: Add runtime Smart Extract configuration PoC

---
 .../Http/Controllers/TaskController.php       | 49 ++++++----
 ProcessMaker/Http/Resources/Task.php          |  3 +-
 .../Providers/ProcessMakerServiceProvider.php |  3 +
 ProcessMaker/ScriptRunners/Base.php           |  2 -
 .../ScriptMicroserviceRunner.php              |  1 -
 .../Services/SmartExtractConfiguration.php    | 81 +++++++++++++++++
 .../Traits/TaskControllerIndexMethods.php     |  3 +-
 .../TaskControllerSmartExtractTest.php        | 64 +++++++++++++
 .../SmartExtractEnvironmentVariablesTest.php  | 68 ++++++++++++++
 .../SmartExtractConfigurationTest.php         | 90 +++++++++++++++++++
 10 files changed, 340 insertions(+), 24 deletions(-)
 create mode 100644 ProcessMaker/Services/SmartExtractConfiguration.php
 create mode 100644 tests/unit/ProcessMaker/Http/Controllers/TaskControllerSmartExtractTest.php
 create mode 100644 tests/unit/ProcessMaker/ScriptRunners/SmartExtractEnvironmentVariablesTest.php
 create mode 100644 tests/unit/ProcessMaker/Services/SmartExtractConfigurationTest.php

diff --git a/ProcessMaker/Http/Controllers/TaskController.php b/ProcessMaker/Http/Controllers/TaskController.php
index 213d9374ab..2672a3abf6 100755
--- a/ProcessMaker/Http/Controllers/TaskController.php
+++ b/ProcessMaker/Http/Controllers/TaskController.php
@@ -27,6 +27,7 @@
 use ProcessMaker\Models\TaskDraft;
 use ProcessMaker\Models\UserResourceView;
 use ProcessMaker\Nayra\Contracts\Bpmn\ScriptTaskInterface;
+use ProcessMaker\Services\SmartExtractConfiguration;
 use ProcessMaker\Traits\HasControllerAddons;
 use ProcessMaker\Traits\SearchAutocompleteTrait;
 use ProcessMaker\Traits\TaskControllerIndexMethods;
@@ -43,6 +44,10 @@ class TaskController extends Controller
         'overdue' => 'Due',
     ];
 
+    public function __construct(private readonly SmartExtractConfiguration $smartExtractConfiguration)
+    {
+    }
+
     public function index()
     {
         $routerPath = Request::route('router');
@@ -190,25 +195,7 @@ public function edit(ProcessRequestToken $task, string $preview = '')
                 'datetime_format',
             ]);
             $userConfiguration = (new UserConfigurationController())->index();
-            $hitlEnabled = config('smart-extract.hitl_enabled', false) && $isSmartExtractTask;
-
-            // Build the iframe source
-            $iframeSrc = null;
-            if ($hitlEnabled) {
-                $dashboardUrl = config('smart-extract.dashboard_url');
-                $requestData = $task->processRequest->data ?? [];
-
-                $documentToken = $requestData['documentToken'] ?? null;
-                $fileId = $requestData['fileId'] ?? null;
-
-                if ($documentToken && $fileId && !empty($dashboardUrl)) {
-                    $queryParams = http_build_query([
-                        'documentToken' => $documentToken,
-                        'fileId' => $fileId,
-                    ]);
-                    $iframeSrc = $dashboardUrl . '?' . $queryParams;
-                }
-            }
+            [$hitlEnabled, $iframeSrc] = $this->smartExtractHitlConfiguration($task, $isSmartExtractTask);
 
             return view('tasks.edit', [
                 'task' => $task,
@@ -231,6 +218,30 @@ public function edit(ProcessRequestToken $task, string $preview = '')
         }
     }
 
+    private function smartExtractHitlConfiguration(
+        ProcessRequestToken $task,
+        bool $isSmartExtractTask
+    ): array {
+        $hitlEnabled = $this->smartExtractConfiguration->hitlEnabled() && $isSmartExtractTask;
+        if (!$hitlEnabled) {
+            return [false, null];
+        }
+
+        $dashboardUrl = $this->smartExtractConfiguration->dashboardUrl();
+        $requestData = $task->processRequest->data ?? [];
+        $documentToken = $requestData['documentToken'] ?? null;
+        $fileId = $requestData['fileId'] ?? null;
+
+        if (!$documentToken || !$fileId || empty($dashboardUrl)) {
+            return [true, null];
+        }
+
+        return [true, $dashboardUrl . '?' . http_build_query([
+            'documentToken' => $documentToken,
+            'fileId' => $fileId,
+        ])];
+    }
+
     public function quickFillEdit(ProcessRequestToken $task)
     {
         $screenVersion = $task->getScreenVersion();
diff --git a/ProcessMaker/Http/Resources/Task.php b/ProcessMaker/Http/Resources/Task.php
index fe19ce85b5..7bf2eae8ff 100644
--- a/ProcessMaker/Http/Resources/Task.php
+++ b/ProcessMaker/Http/Resources/Task.php
@@ -11,6 +11,7 @@
 use ProcessMaker\Models\ProcessRequest;
 use ProcessMaker\Models\ProcessRequestToken;
 use ProcessMaker\Models\User;
+use ProcessMaker\Services\SmartExtractConfiguration;
 use ProcessMaker\Traits\TaskResourceIncludes;
 
 class Task extends ApiResource
@@ -118,7 +119,7 @@ private function addAssignableUsers(&$array, $include)
 
     private function mergeHitlCaseNumber(array &$array): void
     {
-        if (!config('smart-extract.hitl_enabled')) {
+        if (!app(SmartExtractConfiguration::class)->hitlEnabled()) {
             return;
         }
 
diff --git a/ProcessMaker/Providers/ProcessMakerServiceProvider.php b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
index c19ded9d5f..762fd6cd0b 100644
--- a/ProcessMaker/Providers/ProcessMakerServiceProvider.php
+++ b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
@@ -53,6 +53,7 @@
 use ProcessMaker\Providers\PermissionServiceProvider;
 use ProcessMaker\Repositories\SettingsConfigRepository;
 use ProcessMaker\Services\ConditionalRedirectService;
+use ProcessMaker\Services\SmartExtractConfiguration;
 use RuntimeException;
 use Spatie\Multitenancy\Events\MadeTenantCurrentEvent;
 use Spatie\Multitenancy\Events\TenantNotFoundForRequestEvent;
@@ -122,6 +123,8 @@ public function register(): void
         // Register our permission services
         $this->app->register(PermissionServiceProvider::class);
 
+        $this->app->scoped(SmartExtractConfiguration::class);
+
         $this->app->singleton(Managers\PackageManager::class, function () {
             return new Managers\PackageManager();
         });
diff --git a/ProcessMaker/ScriptRunners/Base.php b/ProcessMaker/ScriptRunners/Base.php
index d261245795..f24d4e2a0f 100644
--- a/ProcessMaker/ScriptRunners/Base.php
+++ b/ProcessMaker/ScriptRunners/Base.php
@@ -188,11 +188,9 @@ private function getEnvironmentVariables($useEscape = true)
         // Add the url to the host
         if ($useEscape) {
             $variablesParameter[] = 'HOST_URL=' . escapeshellarg(config('app.docker_host_url'));
-            $variablesParameter[] = 'SMART_EXTRACT_API_HOST=' . escapeshellarg(config('smart-extract.api_host'));
             $variablesParameter[] = 'SMART_EXTRACT_REQUEST_TIMEOUT=' . escapeshellarg((string) config('smart-extract.request_timeout'));
         } else {
             $variablesParameter[] = 'HOST_URL=' . config('app.docker_host_url');
-            $variablesParameter[] = 'SMART_EXTRACT_API_HOST=' . config('smart-extract.api_host');
             $variablesParameter[] = 'SMART_EXTRACT_REQUEST_TIMEOUT=' . config('smart-extract.request_timeout');
         }
 
diff --git a/ProcessMaker/ScriptRunners/ScriptMicroserviceRunner.php b/ProcessMaker/ScriptRunners/ScriptMicroserviceRunner.php
index 7e243c104e..235eaecace 100644
--- a/ProcessMaker/ScriptRunners/ScriptMicroserviceRunner.php
+++ b/ProcessMaker/ScriptRunners/ScriptMicroserviceRunner.php
@@ -136,7 +136,6 @@ private function getEnvironmentVariables(User $user)
             $variablesParameter['API_HOST'] = config('app.docker_host_url') . '/api/1.0';
             $variablesParameter['APP_URL'] = config('app.docker_host_url');
             $variablesParameter['API_SSL_VERIFY'] = (config('app.api_ssl_verify') ? '1' : '0');
-            $variablesParameter['SMART_EXTRACT_API_HOST'] = config('smart-extract.api_host');
             $variablesParameter['SMART_EXTRACT_REQUEST_TIMEOUT'] = config('smart-extract.request_timeout');
         }
 
diff --git a/ProcessMaker/Services/SmartExtractConfiguration.php b/ProcessMaker/Services/SmartExtractConfiguration.php
new file mode 100644
index 0000000000..5ddf03bb98
--- /dev/null
+++ b/ProcessMaker/Services/SmartExtractConfiguration.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace ProcessMaker\Services;
+
+use ProcessMaker\Models\EnvironmentVariable;
+
+class SmartExtractConfiguration
+{
+    public const API_HOST = 'SMART_EXTRACT_API_HOST';
+
+    public const CLIENT_ID = 'SMART_EXTRACT_CLIENT_ID';
+
+    public const CLIENT_SECRET = 'SMART_EXTRACT_CLIENT_SECRET';
+
+    public const DASHBOARD_URL = 'SMART_EXTRACT_DASHBOARD_URL';
+
+    public const HITL_ENABLED = 'SMART_EXTRACT_HITL_ENABLED';
+
+    private ?array $values = null;
+
+    public function apiHost(): ?string
+    {
+        return $this->stringValue(self::API_HOST);
+    }
+
+    public function clientId(): ?string
+    {
+        return $this->stringValue(self::CLIENT_ID);
+    }
+
+    public function clientSecret(): ?string
+    {
+        return $this->stringValue(self::CLIENT_SECRET);
+    }
+
+    public function dashboardUrl(): ?string
+    {
+        return $this->stringValue(self::DASHBOARD_URL);
+    }
+
+    public function hitlEnabled(): bool
+    {
+        $value = $this->stringValue(self::HITL_ENABLED);
+
+        if ($value === null) {
+            return false;
+        }
+
+        return filter_var(trim($value), FILTER_VALIDATE_BOOLEAN, FILTER_NULL_ON_FAILURE) ?? false;
+    }
+
+    private function stringValue(string $name): ?string
+    {
+        $value = $this->values()[$name] ?? null;
+
+        return is_string($value) && trim($value) !== '' ? $value : null;
+    }
+
+    private function values(): array
+    {
+        if ($this->values !== null) {
+            return $this->values;
+        }
+
+        $this->values = EnvironmentVariable::query()
+            ->whereIn('name', [
+                self::API_HOST,
+                self::CLIENT_ID,
+                self::CLIENT_SECRET,
+                self::DASHBOARD_URL,
+                self::HITL_ENABLED,
+            ])
+            ->get()
+            ->mapWithKeys(fn (EnvironmentVariable $variable) => [
+                $variable->name => $variable->value,
+            ])
+            ->all();
+
+        return $this->values;
+    }
+}
diff --git a/ProcessMaker/Traits/TaskControllerIndexMethods.php b/ProcessMaker/Traits/TaskControllerIndexMethods.php
index dcfa97bea0..fd76a3065d 100644
--- a/ProcessMaker/Traits/TaskControllerIndexMethods.php
+++ b/ProcessMaker/Traits/TaskControllerIndexMethods.php
@@ -16,6 +16,7 @@
 use ProcessMaker\Models\User;
 use ProcessMaker\Package\SavedSearch\Models\SavedSearch;
 use ProcessMaker\Query\SyntaxError;
+use ProcessMaker\Services\SmartExtractConfiguration;
 
 trait TaskControllerIndexMethods
 {
@@ -161,7 +162,7 @@ private function excludeNonVisibleTasks($query, $request)
     {
         $nonSystem = filter_var($request->input('non_system'), FILTER_VALIDATE_BOOLEAN);
         $allTasks = filter_var($request->input('all_tasks'), FILTER_VALIDATE_BOOLEAN);
-        $hitlEnabled = filter_var(config('smart-extract.hitl_enabled'), FILTER_VALIDATE_BOOLEAN);
+        $hitlEnabled = app(SmartExtractConfiguration::class)->hitlEnabled();
         $includeScreen = filter_var($request->input('includeScreen'), FILTER_VALIDATE_BOOLEAN);
         $query->when(!$allTasks, function ($query) use ($includeScreen) {
             $query->where(function ($query) use ($includeScreen) {
diff --git a/tests/unit/ProcessMaker/Http/Controllers/TaskControllerSmartExtractTest.php b/tests/unit/ProcessMaker/Http/Controllers/TaskControllerSmartExtractTest.php
new file mode 100644
index 0000000000..6c10b4d719
--- /dev/null
+++ b/tests/unit/ProcessMaker/Http/Controllers/TaskControllerSmartExtractTest.php
@@ -0,0 +1,64 @@
+<?php
+
+namespace Tests\Unit\ProcessMaker\Http\Controllers;
+
+use ProcessMaker\Http\Controllers\TaskController;
+use ProcessMaker\Models\EnvironmentVariable;
+use ProcessMaker\Models\ProcessRequest;
+use ProcessMaker\Models\ProcessRequestToken;
+use ProcessMaker\Services\SmartExtractConfiguration;
+use ReflectionMethod;
+use Tests\TestCase;
+
+class TaskControllerSmartExtractTest extends TestCase
+{
+    public function test_hitl_configuration_uses_runtime_database_values(): void
+    {
+        EnvironmentVariable::factory()->create([
+            'name' => SmartExtractConfiguration::HITL_ENABLED,
+            'value' => 'true',
+        ]);
+        EnvironmentVariable::factory()->create([
+            'name' => SmartExtractConfiguration::DASHBOARD_URL,
+            'value' => 'https://dashboard.example.com/edit.html',
+        ]);
+
+        $processRequest = new ProcessRequest([
+            'data' => [
+                'documentToken' => 'document-token',
+                'fileId' => 'file-123',
+            ],
+        ]);
+        $task = new ProcessRequestToken();
+        $task->setRelation('processRequest', $processRequest);
+
+        $controller = new TaskController(app(SmartExtractConfiguration::class));
+        $method = new ReflectionMethod(TaskController::class, 'smartExtractHitlConfiguration');
+        $method->setAccessible(true);
+
+        [$enabled, $iframeUrl] = $method->invoke($controller, $task, true);
+
+        $this->assertTrue($enabled);
+        $this->assertSame(
+            'https://dashboard.example.com/edit.html?documentToken=document-token&fileId=file-123',
+            $iframeUrl
+        );
+    }
+
+    public function test_hitl_configuration_fails_closed_when_disabled(): void
+    {
+        EnvironmentVariable::factory()->create([
+            'name' => SmartExtractConfiguration::HITL_ENABLED,
+            'value' => 'false',
+        ]);
+
+        $task = new ProcessRequestToken();
+        $task->setRelation('processRequest', new ProcessRequest(['data' => []]));
+
+        $controller = new TaskController(app(SmartExtractConfiguration::class));
+        $method = new ReflectionMethod(TaskController::class, 'smartExtractHitlConfiguration');
+        $method->setAccessible(true);
+
+        $this->assertSame([false, null], $method->invoke($controller, $task, true));
+    }
+}
diff --git a/tests/unit/ProcessMaker/ScriptRunners/SmartExtractEnvironmentVariablesTest.php b/tests/unit/ProcessMaker/ScriptRunners/SmartExtractEnvironmentVariablesTest.php
new file mode 100644
index 0000000000..2d361a19e4
--- /dev/null
+++ b/tests/unit/ProcessMaker/ScriptRunners/SmartExtractEnvironmentVariablesTest.php
@@ -0,0 +1,68 @@
+<?php
+
+namespace Tests\Unit\ProcessMaker\ScriptRunners;
+
+use Illuminate\Support\Facades\Cache;
+use ProcessMaker\Models\EnvironmentVariable;
+use ProcessMaker\Models\Script;
+use ProcessMaker\Models\ScriptExecutor;
+use ProcessMaker\Models\User;
+use ProcessMaker\ScriptRunners\Base;
+use ProcessMaker\ScriptRunners\ScriptMicroserviceRunner;
+use ProcessMaker\Services\SmartExtractConfiguration;
+use ReflectionMethod;
+use Tests\TestCase;
+
+class SmartExtractEnvironmentVariablesTest extends TestCase
+{
+    public function test_local_runner_preserves_database_api_host_without_duplicates(): void
+    {
+        $this->createApiHost();
+        $executor = ScriptExecutor::factory()->create(['language' => 'php']);
+        $runner = new class ($executor) extends Base {
+            public function config($code, array $dockerConfig)
+            {
+                return $dockerConfig;
+            }
+        };
+
+        $method = new ReflectionMethod(Base::class, 'getEnvironmentVariables');
+        $method->setAccessible(true);
+        $variables = $method->invoke($runner, false);
+
+        $apiHosts = array_values(array_filter(
+            $variables,
+            fn (string $variable) => str_starts_with($variable, SmartExtractConfiguration::API_HOST . '=')
+        ));
+
+        $this->assertSame([
+            SmartExtractConfiguration::API_HOST . '=https://database.example.com',
+        ], $apiHosts);
+    }
+
+    public function test_microservice_runner_preserves_database_api_host(): void
+    {
+        $this->createApiHost();
+        $script = Script::factory()->create(['language' => 'php']);
+        $user = User::factory()->create();
+        Cache::put('script-runner-' . $user->id, 'access-token');
+
+        $runner = new ScriptMicroserviceRunner($script);
+        $method = new ReflectionMethod(ScriptMicroserviceRunner::class, 'getEnvironmentVariables');
+        $method->setAccessible(true);
+        $variables = $method->invoke($runner, $user);
+
+        $this->assertSame(
+            'https://database.example.com',
+            $variables[SmartExtractConfiguration::API_HOST]
+        );
+    }
+
+    private function createApiHost(): void
+    {
+        EnvironmentVariable::factory()->create([
+            'name' => SmartExtractConfiguration::API_HOST,
+            'value' => 'https://database.example.com',
+        ]);
+    }
+}
diff --git a/tests/unit/ProcessMaker/Services/SmartExtractConfigurationTest.php b/tests/unit/ProcessMaker/Services/SmartExtractConfigurationTest.php
new file mode 100644
index 0000000000..bcebe58d0a
--- /dev/null
+++ b/tests/unit/ProcessMaker/Services/SmartExtractConfigurationTest.php
@@ -0,0 +1,90 @@
+<?php
+
+namespace Tests\Unit\ProcessMaker\Services;
+
+use Illuminate\Support\Facades\DB;
+use ProcessMaker\Models\EnvironmentVariable;
+use ProcessMaker\Services\SmartExtractConfiguration;
+use Tests\TestCase;
+
+class SmartExtractConfigurationTest extends TestCase
+{
+    public function test_it_loads_and_decrypts_all_values_with_one_query(): void
+    {
+        $this->createConfigurationVariables();
+
+        DB::flushQueryLog();
+        DB::enableQueryLog();
+
+        $configuration = new SmartExtractConfiguration();
+
+        $this->assertSame('https://extract.example.com', $configuration->apiHost());
+        $this->assertSame('client-id', $configuration->clientId());
+        $this->assertSame('client-secret', $configuration->clientSecret());
+        $this->assertSame('https://dashboard.example.com/edit.html', $configuration->dashboardUrl());
+        $this->assertTrue($configuration->hitlEnabled());
+
+        $queries = collect(DB::getQueryLog())
+            ->filter(fn (array $query) => str_contains($query['query'], 'environment_variables'));
+
+        $this->assertCount(1, $queries);
+    }
+
+    public function test_missing_empty_and_invalid_values_fail_closed(): void
+    {
+        EnvironmentVariable::factory()->create([
+            'name' => SmartExtractConfiguration::HITL_ENABLED,
+            'value' => 'not-a-boolean',
+        ]);
+        EnvironmentVariable::factory()->create([
+            'name' => SmartExtractConfiguration::DASHBOARD_URL,
+            'value' => '   ',
+        ]);
+
+        $configuration = new SmartExtractConfiguration();
+
+        $this->assertFalse($configuration->hitlEnabled());
+        $this->assertNull($configuration->apiHost());
+        $this->assertNull($configuration->clientId());
+        $this->assertNull($configuration->clientSecret());
+        $this->assertNull($configuration->dashboardUrl());
+    }
+
+    public function test_scoped_configuration_refreshes_on_the_next_lifecycle(): void
+    {
+        $apiHost = EnvironmentVariable::factory()->create([
+            'name' => SmartExtractConfiguration::API_HOST,
+            'value' => 'https://first.example.com',
+        ]);
+
+        $currentLifecycle = app(SmartExtractConfiguration::class);
+        $this->assertSame('https://first.example.com', $currentLifecycle->apiHost());
+
+        $apiHost->value = 'https://second.example.com';
+        $apiHost->save();
+
+        $this->assertSame('https://first.example.com', $currentLifecycle->apiHost());
+
+        app()->forgetScopedInstances();
+        $nextLifecycle = app(SmartExtractConfiguration::class);
+
+        $this->assertNotSame($currentLifecycle, $nextLifecycle);
+        $this->assertSame('https://second.example.com', $nextLifecycle->apiHost());
+    }
+
+    private function createConfigurationVariables(): void
+    {
+        foreach ([
+            SmartExtractConfiguration::API_HOST => 'https://extract.example.com',
+            SmartExtractConfiguration::CLIENT_ID => 'client-id',
+            SmartExtractConfiguration::CLIENT_SECRET => 'client-secret',
+            SmartExtractConfiguration::DASHBOARD_URL => 'https://dashboard.example.com/edit.html',
+            SmartExtractConfiguration::HITL_ENABLED => 'true',
+        ] as $name => $value) {
+            EnvironmentVariable::factory()->create([
+                'name' => $name,
+                'value' => $value,
+            ]);
+        }
+    }
+}

From 91b80b6032cb45b106932fe3698e5733cdc95471 Mon Sep 17 00:00:00 2001
From: sanja <52755494+sanjacornelius@users.noreply.github.com>
Date: Wed, 15 Jul 2026 12:02:33 -0700
Subject: [PATCH 20/52] Remove authorization badge from microsoft_graph

---
 resources/js/admin/settings/components/SettingsListing.vue | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/resources/js/admin/settings/components/SettingsListing.vue b/resources/js/admin/settings/components/SettingsListing.vue
index 01a3ae7e30..0d489764b3 100644
--- a/resources/js/admin/settings/components/SettingsListing.vue
+++ b/resources/js/admin/settings/components/SettingsListing.vue
@@ -607,9 +607,7 @@ export default {
     filterEmailServerButtons(groupName, groupData, btn) {
       const authMethod = groupData.find(data => data.key.includes("EMAIL_CONNECTOR_MAIL_AUTH_METHOD"));
       const selectedAuthMethod = authMethod ? authMethod.ui.options[authMethod.config] : null;
-      const mailDriver = groupData.find(data => data.key.includes("EMAIL_CONNECTOR_MAIL_DRIVER"));
-      const selectedDriver = mailDriver ? mailDriver.ui.options[mailDriver.config] : null;
-      const showAuthAccBtn = (selectedAuthMethod && selectedAuthMethod !== 'standard') || selectedDriver === 'microsoft_graph';
+      const showAuthAccBtn = selectedAuthMethod && selectedAuthMethod !== 'standard';
 
       if (groupName.includes('Email Server') && !showAuthAccBtn)  {
         // Returns all 'top' position buttons except the '+ Mail Server' and 'Authorize Account' button for email server tabs

From fc31cdb71c067702cd16e00a73c0b5ba069aec33 Mon Sep 17 00:00:00 2001
From: sanja <52755494+sanjacornelius@users.noreply.github.com>
Date: Thu, 16 Jul 2026 09:29:01 -0700
Subject: [PATCH 21/52] Remove caching from Microsoft Graph token provider

Drop the use of Illuminate\Support\Facades\Cache and the Cache::remember call so getAccessToken always calls requestAccessToken.
---
 ProcessMaker/Mail/MicrosoftGraphTokenProvider.php        | 9 ++-------
 .../Mail/MicrosoftGraphTokenProviderTest.php             | 4 ----
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php b/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
index 1b97e5af05..7f2bf2fa85 100644
--- a/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
+++ b/ProcessMaker/Mail/MicrosoftGraphTokenProvider.php
@@ -3,7 +3,6 @@
 namespace ProcessMaker\Mail;
 
 use GuzzleHttp\Client;
-use Illuminate\Support\Facades\Cache;
 use RuntimeException;
 
 class MicrosoftGraphTokenProvider
@@ -15,17 +14,13 @@ class MicrosoftGraphTokenProvider
     public function __construct(
         private array $config,
         private int|string $serverIndex = 0,
-        private ?Client $httpClient = null
+        private ?Client $httpClient = null,
     ) {
     }
 
     public function getAccessToken(): string
     {
-        $cacheKey = 'microsoft_graph_access_token_' . ($this->serverIndex ?: 'default');
-
-        return Cache::remember($cacheKey, now()->addMinutes(50), function () {
-            return $this->requestAccessToken();
-        });
+        return $this->requestAccessToken();
     }
 
     private function requestAccessToken(): string
diff --git a/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php b/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
index a4f62d67d5..be23d292f6 100644
--- a/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
+++ b/tests/unit/ProcessMaker/Mail/MicrosoftGraphTokenProviderTest.php
@@ -4,7 +4,6 @@
 
 use GuzzleHttp\Client;
 use GuzzleHttp\Psr7\Response;
-use Illuminate\Support\Facades\Cache;
 use Mockery;
 use ProcessMaker\Mail\MicrosoftGraphTokenProvider;
 use RuntimeException;
@@ -34,8 +33,6 @@ public function testGetAccessTokenThrowsWhenCredentialsAreMissing()
 
     public function testGetAccessTokenRequestsTokenFromMicrosoft()
     {
-        Cache::flush();
-
         $tokenResponse = new Response(200, [], json_encode(['access_token' => 'token-from-azure']));
 
         $guzzle = Mockery::mock(Client::class);
@@ -60,6 +57,5 @@ public function testGetAccessTokenRequestsTokenFromMicrosoft()
         ], 1, $guzzle);
 
         $this->assertSame('token-from-azure', $provider->getAccessToken());
-        $this->assertSame('token-from-azure', $provider->getAccessToken());
     }
 }

From 3b82c6141ef626cd767b7faa867d875b91cadeae Mon Sep 17 00:00:00 2001
From: sanja <52755494+sanjacornelius@users.noreply.github.com>
Date: Thu, 16 Jul 2026 11:44:28 -0700
Subject: [PATCH 22/52] Include file attachments in Graph payload

Add convertAttachments() to MicrosoftGraphMessageConverter to map Symfony Email attachments to Microsoft Graph fileAttachment objects (name, contentType, contentBytes base64) and include them in toSendMailPayload when present.
---
 .../Mail/MicrosoftGraphMessageConverter.php   | 21 +++++++++
 .../MicrosoftGraphMessageConverterTest.php    | 43 +++++++++++++++++++
 2 files changed, 64 insertions(+)
 create mode 100644 tests/unit/ProcessMaker/Mail/MicrosoftGraphMessageConverterTest.php

diff --git a/ProcessMaker/Mail/MicrosoftGraphMessageConverter.php b/ProcessMaker/Mail/MicrosoftGraphMessageConverter.php
index e95a3ea281..a87205cdcc 100644
--- a/ProcessMaker/Mail/MicrosoftGraphMessageConverter.php
+++ b/ProcessMaker/Mail/MicrosoftGraphMessageConverter.php
@@ -31,6 +31,11 @@ public static function toSendMailPayload(Email $email): array
             $message['bccRecipients'] = $bccRecipients;
         }
 
+        $attachments = self::convertAttachments($email);
+        if ($attachments) {
+            $message['attachments'] = $attachments;
+        }
+
         return [
             'message' => $message,
             'saveToSentItems' => true,
@@ -52,4 +57,20 @@ private static function convertAddresses(array $addresses): array
             return ['emailAddress' => $emailAddress];
         }, $addresses);
     }
+
+    private static function convertAttachments(Email $email): array
+    {
+        $attachments = [];
+
+        foreach ($email->getAttachments() as $attachment) {
+            $attachments[] = [
+                '@odata.type' => '#microsoft.graph.fileAttachment',
+                'name' => $attachment->getFilename() ?: 'attachment',
+                'contentType' => $attachment->getMediaType() . '/' . $attachment->getMediaSubtype(),
+                'contentBytes' => base64_encode($attachment->getBody()),
+            ];
+        }
+
+        return $attachments;
+    }
 }
diff --git a/tests/unit/ProcessMaker/Mail/MicrosoftGraphMessageConverterTest.php b/tests/unit/ProcessMaker/Mail/MicrosoftGraphMessageConverterTest.php
new file mode 100644
index 0000000000..71d172a2ca
--- /dev/null
+++ b/tests/unit/ProcessMaker/Mail/MicrosoftGraphMessageConverterTest.php
@@ -0,0 +1,43 @@
+<?php
+
+namespace Tests\Unit\ProcessMaker\Mail;
+
+use ProcessMaker\Mail\MicrosoftGraphMessageConverter;
+use Symfony\Component\Mime\Email;
+use Tests\TestCase;
+
+class MicrosoftGraphMessageConverterTest extends TestCase
+{
+    public function testToSendMailPayloadIncludesFileAttachments()
+    {
+        $email = (new Email())
+            ->to('recipient@example.com')
+            ->subject('With attachment')
+            ->html('<p>Hello</p>')
+            ->attach('file-contents', 'report.txt', 'text/plain');
+
+        $payload = MicrosoftGraphMessageConverter::toSendMailPayload($email);
+
+        $this->assertSame('With attachment', $payload['message']['subject']);
+        $this->assertSame('HTML', $payload['message']['body']['contentType']);
+        $this->assertCount(1, $payload['message']['attachments']);
+        $this->assertSame([
+            '@odata.type' => '#microsoft.graph.fileAttachment',
+            'name' => 'report.txt',
+            'contentType' => 'text/plain',
+            'contentBytes' => base64_encode('file-contents'),
+        ], $payload['message']['attachments'][0]);
+    }
+
+    public function testToSendMailPayloadOmitsAttachmentsKeyWhenNonePresent()
+    {
+        $email = (new Email())
+            ->to('recipient@example.com')
+            ->subject('No attachment')
+            ->text('Hello');
+
+        $payload = MicrosoftGraphMessageConverter::toSendMailPayload($email);
+
+        $this->assertArrayNotHasKey('attachments', $payload['message']);
+    }
+}

From 656192cf7a2dd8d0a1f0f430db9822fe06709755 Mon Sep 17 00:00:00 2001
From: Paula Quispe <paula.quispe@processmaker.com>
Date: Mon, 20 Jul 2026 18:53:55 -0400
Subject: [PATCH 23/52] feat: FOUR-30102 Command to update the timezone for the
 Anonymous user

---
 .../Commands/UpdateAnonymousUserTimezone.php  | 55 +++++++++++++
 config/app.php                                |  3 +
 .../UpdateAnonymousUserTimezoneTest.php       | 82 +++++++++++++++++++
 3 files changed, 140 insertions(+)
 create mode 100644 ProcessMaker/Console/Commands/UpdateAnonymousUserTimezone.php
 create mode 100644 tests/Feature/Console/UpdateAnonymousUserTimezoneTest.php

diff --git a/ProcessMaker/Console/Commands/UpdateAnonymousUserTimezone.php b/ProcessMaker/Console/Commands/UpdateAnonymousUserTimezone.php
new file mode 100644
index 0000000000..ae83216480
--- /dev/null
+++ b/ProcessMaker/Console/Commands/UpdateAnonymousUserTimezone.php
@@ -0,0 +1,55 @@
+<?php
+
+namespace ProcessMaker\Console\Commands;
+
+use Illuminate\Console\Command;
+use ProcessMaker\Models\AnonymousUser;
+use ProcessMaker\Models\User;
+
+class UpdateAnonymousUserTimezone extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'processmaker:update-anonymous-user-timezone
+                            {--timezone= : Timezone to assign. Defaults to config app.anonymous_user_timezone}';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Update the anonymous user timezone from config (safe to run multiple times)';
+
+    /**
+     * Execute the console command.
+     */
+    public function handle(): int
+    {
+        $timezone = $this->option('timezone') ?: config('app.anonymous_user_timezone', 'UTC');
+
+        $user = User::where('username', AnonymousUser::ANONYMOUS_USERNAME)->first();
+
+        if (!$user) {
+            $this->error('Anonymous user not found.');
+
+            return self::FAILURE;
+        }
+
+        if ($user->timezone === $timezone) {
+            $this->info("Anonymous user timezone is already set to [{$timezone}].");
+
+            return self::SUCCESS;
+        }
+
+        $previousTimezone = $user->timezone;
+        $user->timezone = $timezone;
+        $user->save();
+
+        $this->info("Anonymous user timezone updated from [{$previousTimezone}] to [{$timezone}].");
+
+        return self::SUCCESS;
+    }
+}
diff --git a/config/app.php b/config/app.php
index 2d3855b971..b3c5891f98 100644
--- a/config/app.php
+++ b/config/app.php
@@ -32,6 +32,9 @@
     // The timezone for the application
     'timezone' => env('APP_TIMEZONE', 'America/Los_Angeles'),
 
+    // The timezone for the anonymous user
+    'anonymous_user_timezone' => env('ANONYMOUS_USER_TIMEZONE', 'UTC'),
+
     // The time format for the application
     'dateformat' => env('DATE_FORMAT', 'm/d/Y h:i A'),
 
diff --git a/tests/Feature/Console/UpdateAnonymousUserTimezoneTest.php b/tests/Feature/Console/UpdateAnonymousUserTimezoneTest.php
new file mode 100644
index 0000000000..51d7ca39bb
--- /dev/null
+++ b/tests/Feature/Console/UpdateAnonymousUserTimezoneTest.php
@@ -0,0 +1,82 @@
+<?php
+
+namespace Tests\Feature\Console;
+
+use ProcessMaker\Models\AnonymousUser;
+use ProcessMaker\Models\User;
+use Tests\TestCase;
+
+class UpdateAnonymousUserTimezoneTest extends TestCase
+{
+    public function testUpdatesTimezoneFromConfig(): void
+    {
+        $user = User::where('username', AnonymousUser::ANONYMOUS_USERNAME)->firstOrFail();
+        $user->timezone = 'America/Chicago';
+        $user->save();
+
+        config(['app.anonymous_user_timezone' => 'America/New_York']);
+
+        $this->artisan('processmaker:update-anonymous-user-timezone')
+            ->expectsOutput('Anonymous user timezone updated from [America/Chicago] to [America/New_York].')
+            ->assertExitCode(0);
+
+        $this->assertEquals('America/New_York', $user->fresh()->timezone);
+    }
+
+    public function testDoesNothingWhenTimezoneAlreadyMatches(): void
+    {
+        $user = User::where('username', AnonymousUser::ANONYMOUS_USERNAME)->firstOrFail();
+        $user->timezone = 'UTC';
+        $user->save();
+
+        config(['app.anonymous_user_timezone' => 'UTC']);
+
+        $this->artisan('processmaker:update-anonymous-user-timezone')
+            ->expectsOutput('Anonymous user timezone is already set to [UTC].')
+            ->assertExitCode(0);
+
+        $this->assertEquals('UTC', $user->fresh()->timezone);
+    }
+
+    public function testUpdatesTimezoneFromOption(): void
+    {
+        $user = User::where('username', AnonymousUser::ANONYMOUS_USERNAME)->firstOrFail();
+        $user->timezone = 'UTC';
+        $user->save();
+
+        config(['app.anonymous_user_timezone' => 'UTC']);
+
+        $this->artisan('processmaker:update-anonymous-user-timezone', [
+            '--timezone' => 'Europe/Madrid',
+        ])
+            ->expectsOutput('Anonymous user timezone updated from [UTC] to [Europe/Madrid].')
+            ->assertExitCode(0);
+
+        $this->assertEquals('Europe/Madrid', $user->fresh()->timezone);
+    }
+
+    public function testCanBeRunMultipleTimes(): void
+    {
+        $user = User::where('username', AnonymousUser::ANONYMOUS_USERNAME)->firstOrFail();
+        $user->timezone = 'America/Chicago';
+        $user->save();
+
+        config(['app.anonymous_user_timezone' => 'America/Los_Angeles']);
+
+        $this->artisan('processmaker:update-anonymous-user-timezone')->assertExitCode(0);
+        $this->artisan('processmaker:update-anonymous-user-timezone')
+            ->expectsOutput('Anonymous user timezone is already set to [America/Los_Angeles].')
+            ->assertExitCode(0);
+
+        $this->assertEquals('America/Los_Angeles', $user->fresh()->timezone);
+    }
+
+    public function testFailsWhenAnonymousUserDoesNotExist(): void
+    {
+        User::where('username', AnonymousUser::ANONYMOUS_USERNAME)->forceDelete();
+
+        $this->artisan('processmaker:update-anonymous-user-timezone')
+            ->expectsOutput('Anonymous user not found.')
+            ->assertExitCode(1);
+    }
+}

From e819c3c802d60157fc720fe131e6816c668770e4 Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Wed, 22 Jul 2026 15:12:05 -0600
Subject: [PATCH 24/52] FOUR-32333: Isolate DevLink progress by operation

---
 ProcessMaker/Events/ImportLog.php             |  3 +-
 .../Controllers/Api/DevLinkController.php     | 18 ++++-
 ProcessMaker/ImportExport/Logger.php          | 13 +++-
 ProcessMaker/Jobs/DevLinkInstall.php          | 14 +++-
 .../admin/devlink/components/AssetListing.vue | 12 ++-
 .../devlink/components/InstallProgress.vue    | 10 +++
 .../js/admin/devlink/components/Instance.vue  | 12 ++-
 .../admin/devlink/components/UpdateBundle.vue | 13 +++-
 .../js/admin/devlink/createOperationId.js     |  9 +++
 tests/Feature/Api/DevLinkTest.php             | 74 +++++++++++++++++++
 tests/Feature/ImportExport/LoggerTest.php     | 52 +++++++++++++
 tests/Feature/Jobs/DevLinkInstallTest.php     | 48 ++++++++++++
 12 files changed, 267 insertions(+), 11 deletions(-)
 create mode 100644 resources/js/admin/devlink/createOperationId.js
 create mode 100644 tests/Feature/ImportExport/LoggerTest.php
 create mode 100644 tests/Feature/Jobs/DevLinkInstallTest.php

diff --git a/ProcessMaker/Events/ImportLog.php b/ProcessMaker/Events/ImportLog.php
index 96cbfe6aec..9168795f9d 100644
--- a/ProcessMaker/Events/ImportLog.php
+++ b/ProcessMaker/Events/ImportLog.php
@@ -16,7 +16,8 @@ public function __construct(
         public $userId,
         public $type,
         public $message,
-        public $additionalParams = []
+        public $additionalParams = [],
+        public $operationId = null,
     ) {
     }
 
diff --git a/ProcessMaker/Http/Controllers/Api/DevLinkController.php b/ProcessMaker/Http/Controllers/Api/DevLinkController.php
index 8994184d1a..065aa3769b 100644
--- a/ProcessMaker/Http/Controllers/Api/DevLinkController.php
+++ b/ProcessMaker/Http/Controllers/Api/DevLinkController.php
@@ -6,6 +6,7 @@
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\File;
 use Illuminate\Support\Facades\Notification;
+use Illuminate\Support\Str;
 use Illuminate\Validation\Rule;
 use ProcessMaker\Events\CustomizeUiUpdated;
 use ProcessMaker\Exception\ValidationException;
@@ -211,6 +212,7 @@ public function deleteBundle(Bundle $bundle)
     public function installRemoteBundle(Request $request, DevLink $devLink, $remoteBundleId)
     {
         $updateType = $request->input('updateType', DevLinkInstall::MODE_UPDATE);
+        $operationId = $this->operationId($request);
         DevLinkInstall::dispatch(
             $request->user()->id,
             $devLink->id,
@@ -218,6 +220,7 @@ public function installRemoteBundle(Request $request, DevLink $devLink, $remoteB
             $remoteBundleId,
             $updateType,
             DevLinkInstall::TYPE_INSTALL_BUNDLE,
+            $operationId,
         );
 
         return [
@@ -228,6 +231,7 @@ public function installRemoteBundle(Request $request, DevLink $devLink, $remoteB
     public function reinstallBundle(Request $request, Bundle $bundle)
     {
         $updateType = $request->input('updateType', DevLinkInstall::MODE_UPDATE);
+        $operationId = $this->operationId($request);
         DevLinkInstall::dispatch(
             $request->user()->id,
             $bundle->dev_link_id,
@@ -235,6 +239,7 @@ public function reinstallBundle(Request $request, Bundle $bundle)
             $bundle->id,
             $updateType,
             DevLinkInstall::TYPE_REINSTALL_BUNDLE,
+            $operationId,
         );
 
         return [
@@ -356,6 +361,7 @@ public function removeSharedAsset($id)
     public function installRemoteAsset(Request $request, DevLink $devLink)
     {
         $updateType = $request->input('updateType', DevLinkInstall::MODE_UPDATE);
+        $operationId = $this->operationId($request);
 
         DevLinkInstall::dispatch(
             $request->user()->id,
@@ -363,7 +369,8 @@ public function installRemoteAsset(Request $request, DevLink $devLink)
             $request->input('class'),
             $request->input('id'),
             $updateType,
-            DevLinkInstall::TYPE_IMPORT_ASSET
+            DevLinkInstall::TYPE_IMPORT_ASSET,
+            $operationId,
         );
 
         return [
@@ -416,6 +423,15 @@ public function refreshUi()
         CustomizeUiUpdated::dispatch([], [], false);
     }
 
+    private function operationId(Request $request): string
+    {
+        $validated = $request->validate([
+            'operation_id' => ['nullable', 'string', 'max:100'],
+        ]);
+
+        return $validated['operation_id'] ?? (string) Str::uuid();
+    }
+
     private function writeColors($data)
     {
         // Now generate the _colors.scss file
diff --git a/ProcessMaker/ImportExport/Logger.php b/ProcessMaker/ImportExport/Logger.php
index f77b7adea4..2764d65eda 100644
--- a/ProcessMaker/ImportExport/Logger.php
+++ b/ProcessMaker/ImportExport/Logger.php
@@ -14,16 +14,19 @@ class Logger
 
     public $userId = null;
 
+    public $operationId = null;
+
     private $warnings = [];
 
     private int $totalSteps = 1;
 
     private int $currentStep = 1;
 
-    public function __construct($userId = null)
+    public function __construct($userId = null, $operationId = null)
     {
         $this->pid = getmypid();
         $this->userId = $userId;
+        $this->operationId = $operationId;
 
         if ($userId) {
             Event::listen(MessageLogged::class, function (MessageLogged $e) {
@@ -71,7 +74,13 @@ private function dispatch($type, $message, $additionalParams = [])
             return;
         }
 
-        ImportLog::dispatch($this->userId, $type, substr($message, 0, 1000), $additionalParams);
+        ImportLog::dispatch(
+            $this->userId,
+            $type,
+            substr($message, 0, 1000),
+            $additionalParams,
+            $this->operationId,
+        );
         $this->logToFile($type, $message, $additionalParams);
     }
 
diff --git a/ProcessMaker/Jobs/DevLinkInstall.php b/ProcessMaker/Jobs/DevLinkInstall.php
index c30519e201..772aefbc31 100644
--- a/ProcessMaker/Jobs/DevLinkInstall.php
+++ b/ProcessMaker/Jobs/DevLinkInstall.php
@@ -33,6 +33,14 @@ class DevLinkInstall implements ShouldQueue
 
     public $maxExceptions = 1;
 
+    /**
+     * Correlates progress events with the DevLink operation that started them.
+     *
+     * This remains nullable so jobs queued before this property was introduced
+     * can still be processed after an application upgrade.
+     */
+    public $operationId = null;
+
     public function __construct(
         public int $userId,
         public int $devLinkId,
@@ -40,7 +48,9 @@ public function __construct(
         public int $id,
         public string $importMode,
         public string $type,
+        $operationId = null,
     ) {
+        $this->operationId = $operationId;
     }
 
     /**
@@ -51,7 +61,7 @@ public function handle(): void
         //log
         \Log::info('DevLinkInstall job started: ' . $this->devLinkId);
         $devLink = DevLink::findOrFail($this->devLinkId);
-        $logger = new Logger($this->userId);
+        $logger = new Logger($this->userId, $this->operationId);
 
         $lock = Cache::lock(ImportV2::CACHE_LOCK_KEY, ImportV2::RELEASE_LOCK_AFTER);
 
@@ -82,7 +92,7 @@ public function handle(): void
 
     public function failed(Throwable $exception): void
     {
-        (new Logger($this->userId))->exception($exception);
+        (new Logger($this->userId, $this->operationId))->exception($exception);
 
         // Unlock the job
         // We can't use $this->lock->release() here because this is run in a new instance
diff --git a/resources/js/admin/devlink/components/AssetListing.vue b/resources/js/admin/devlink/components/AssetListing.vue
index a5716181d3..5a878dcee7 100644
--- a/resources/js/admin/devlink/components/AssetListing.vue
+++ b/resources/js/admin/devlink/components/AssetListing.vue
@@ -7,6 +7,7 @@ import types from './assetTypes';
 import moment from 'moment';
 import Header from './Header.vue';
 import InstallProgress from './InstallProgress.vue';
+import createOperationId from '../createOperationId';
 
 const route = useRoute();
 const vue = getCurrentInstance().proxy;
@@ -20,6 +21,7 @@ const showInstallModal = ref(false);
 const showConfirmModal = ref(false);
 const selectedAsset = ref(null);
 const installMode = ref('update');
+const operationId = ref('');
 const page = ref(1);
 const perPage = ref(15);
 
@@ -89,12 +91,14 @@ const install = (asset) => {
 
 const confirmInstall = () => {
   if (selectedAsset.value) {
+    operationId.value = createOperationId();
     showConfirmModal.value = false;
     showInstallModal.value = true;
     const params = {
       class: typeConfig.class,
       id: selectedAsset.value.id,
-      updateType: installMode.value
+      updateType: installMode.value,
+      operation_id: operationId.value,
     };
     ProcessMaker.apiClient
       .post(`/devlink/${route.params.id}/install-remote-asset`, params)
@@ -210,7 +214,11 @@ const handleFilterChange = () => {
 
     <!-- Progress Modal -->
     <b-modal id="install-progress" size="lg" v-model="showInstallModal" :title="$t('Installation Progress')" hide-footer>
-      <install-progress />
+      <install-progress
+        v-if="operationId"
+        :key="operationId"
+        :operation-id="operationId"
+      />
     </b-modal>
   </div>
 </template>
diff --git a/resources/js/admin/devlink/components/InstallProgress.vue b/resources/js/admin/devlink/components/InstallProgress.vue
index 400efe0a83..e7093e76be 100644
--- a/resources/js/admin/devlink/components/InstallProgress.vue
+++ b/resources/js/admin/devlink/components/InstallProgress.vue
@@ -36,6 +36,12 @@
 import { ref, onMounted, onUnmounted, getCurrentInstance } from 'vue';
 
 const vue = getCurrentInstance().proxy;
+const props = defineProps({
+  operationId: {
+    type: String,
+    required: true,
+  },
+});
 const progress = ref(0);
 const userId = window.ProcessMaker.user.id;
 const done = ref(false);
@@ -50,6 +56,10 @@ onMounted(() => {
   window.Echo.private(`ProcessMaker.Models.User.${userId}`).listen(
     '.ImportLog',
     (response) => {
+      if (response.operationId !== props.operationId) {
+        return;
+      }
+
       showSpinner.value = false;
       if (response.type === 'progress') {
         progress.value = response.message;
diff --git a/resources/js/admin/devlink/components/Instance.vue b/resources/js/admin/devlink/components/Instance.vue
index be6c70400c..17abdcfd00 100644
--- a/resources/js/admin/devlink/components/Instance.vue
+++ b/resources/js/admin/devlink/components/Instance.vue
@@ -4,6 +4,7 @@ import debounce from 'lodash/debounce';
 import { useRouter, useRoute } from 'vue-router/composables';
 import InstanceTabs from './InstanceTabs.vue';
 import InstallProgress from './InstallProgress.vue';
+import createOperationId from '../createOperationId';
 
 const vue = getCurrentInstance().proxy;
 const router = useRouter();
@@ -16,6 +17,7 @@ const warnings = ref([]);
 const showInstallModal = ref(false);
 const confirmUpdateVersion = ref(null);
 const selectedOption = ref('update');
+const operationId = ref('');
 const bundleAttributes = {
   id: null,
   name: '',
@@ -88,9 +90,12 @@ const install = (bundle) => {
     cancelTitle: vue.$t('Cancel')
   }).then((confirm) => {
     if (confirm) {
+      operationId.value = createOperationId();
       showInstallModal.value = true;
       ProcessMaker.apiClient
-        .post(`/devlink/${route.params.id}/remote-bundles/${bundle.id}/install`)
+        .post(`/devlink/${route.params.id}/remote-bundles/${bundle.id}/install`, {
+          operation_id: operationId.value,
+        })
         .then((response) => {
           // Handle the response as needed
         });
@@ -98,10 +103,12 @@ const install = (bundle) => {
   });
 };
 const executeUpdate = (updateType) => {
+  operationId.value = createOperationId();
   showInstallModal.value = true;
   ProcessMaker.apiClient
     .post(`/devlink/${route.params.id}/remote-bundles/${selected.value.id}/install`, {
       updateType,
+      operation_id: operationId.value,
     })
     .then((response) => {
       // Handle the response as needed
@@ -163,6 +170,9 @@ const executeUpdate = (updateType) => {
     </div>
     <b-modal id="install-progress" size="lg" v-model="showInstallModal" :title="$t('Installation Progress')" hide-footer>
       <install-progress
+        v-if="operationId"
+        :key="operationId"
+        :operation-id="operationId"
         @installation-complete="load"
       />
     </b-modal>
diff --git a/resources/js/admin/devlink/components/UpdateBundle.vue b/resources/js/admin/devlink/components/UpdateBundle.vue
index f601099fdf..d3ce7914b6 100644
--- a/resources/js/admin/devlink/components/UpdateBundle.vue
+++ b/resources/js/admin/devlink/components/UpdateBundle.vue
@@ -1,6 +1,7 @@
 <script setup>
 import { ref, computed, getCurrentInstance, defineEmits, defineExpose } from 'vue';
 import InstallProgress from './InstallProgress.vue';
+import createOperationId from '../createOperationId';
 
 const vue = getCurrentInstance().proxy;
 const confirmUpdateVersion = ref(null);
@@ -8,6 +9,7 @@ const selected = ref(null);
 const selectedOption = ref('update');
 const showInstallModal = ref(false);
 const reinstall = ref(false);
+const operationId = ref('');
 const title = computed(() => {
   if (reinstall.value) {
     return 'Reinstall Bundle';
@@ -40,6 +42,7 @@ const updateBundleText = computed(() => {
 });
 
 const executeUpdate = (updateType) => {
+  operationId.value = createOperationId();
   showInstallModal.value = true;
   let url;
   if (reinstall.value) {
@@ -51,6 +54,7 @@ const executeUpdate = (updateType) => {
   ProcessMaker.apiClient
     .post(url, {
       updateType,
+      operation_id: operationId.value,
     })
     .then((response) => {
       // Handle the response as needed
@@ -99,7 +103,12 @@ const handleInstallationComplete = () => {
     </b-modal>
 
     <b-modal id="install-progress" size="lg" v-model="showInstallModal" :title="$t('Installation Progress')" hide-footer>
-      <install-progress @installation-complete="handleInstallationComplete" />
+      <install-progress
+        v-if="operationId"
+        :key="operationId"
+        :operation-id="operationId"
+        @installation-complete="handleInstallationComplete"
+      />
     </b-modal>
   </div>
-</template>
\ No newline at end of file
+</template>
diff --git a/resources/js/admin/devlink/createOperationId.js b/resources/js/admin/devlink/createOperationId.js
new file mode 100644
index 0000000000..1f5748dde8
--- /dev/null
+++ b/resources/js/admin/devlink/createOperationId.js
@@ -0,0 +1,9 @@
+const createOperationId = () => {
+  if (typeof window.crypto?.randomUUID === "function") {
+    return window.crypto.randomUUID();
+  }
+
+  return `${Date.now()}-${Math.random().toString(36).slice(2)}`;
+};
+
+export default createOperationId;
diff --git a/tests/Feature/Api/DevLinkTest.php b/tests/Feature/Api/DevLinkTest.php
index 9bed587b88..59cc940400 100644
--- a/tests/Feature/Api/DevLinkTest.php
+++ b/tests/Feature/Api/DevLinkTest.php
@@ -2,8 +2,11 @@
 
 namespace Tests\Feature\Api;
 
+use Illuminate\Support\Facades\Bus;
 use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Str;
 use ProcessMaker\Http\Controllers\Api\DevLinkController;
+use ProcessMaker\Jobs\DevLinkInstall;
 use ProcessMaker\Models\Bundle;
 use ProcessMaker\Models\DevLink;
 use ProcessMaker\Models\Screen;
@@ -78,4 +81,75 @@ public function testInstallRemoteAsset()
         $screen->refresh();
         $this->assertEquals('Modified title', $screen->title);
     }
+
+    public function testInstallEndpointsPassOperationIdToQueuedJobs()
+    {
+        Bus::fake();
+
+        $operationId = (string) Str::uuid();
+        $devLink = DevLink::factory()->create();
+        $bundle = Bundle::factory()->create([
+            'dev_link_id' => $devLink->id,
+        ]);
+
+        $installResponse = $this->apiCall(
+            'POST',
+            route('api.devlink.install-remote-bundle', [
+                'devLink' => $devLink->id,
+                'remoteBundleId' => 123,
+            ]),
+            ['operation_id' => $operationId]
+        );
+        $reinstallResponse = $this->apiCall(
+            'POST',
+            route('api.devlink.reinstall-bundle', ['bundle' => $bundle->id]),
+            ['operation_id' => $operationId]
+        );
+        $assetResponse = $this->apiCall(
+            'POST',
+            route('api.devlink.install-remote-asset', ['devLink' => $devLink->id]),
+            [
+                'id' => 456,
+                'class' => Screen::class,
+                'operation_id' => $operationId,
+            ]
+        );
+
+        $installResponse->assertOk()->assertExactJson(['status' => 'queued']);
+        $reinstallResponse->assertOk()->assertExactJson(['status' => 'queued']);
+        $assetResponse->assertOk()->assertExactJson(['status' => 'queued']);
+
+        Bus::assertDispatched(DevLinkInstall::class, function (DevLinkInstall $job) use ($operationId) {
+            return $job->type === DevLinkInstall::TYPE_INSTALL_BUNDLE
+                && $job->operationId === $operationId;
+        });
+        Bus::assertDispatched(DevLinkInstall::class, function (DevLinkInstall $job) use ($operationId) {
+            return $job->type === DevLinkInstall::TYPE_REINSTALL_BUNDLE
+                && $job->operationId === $operationId;
+        });
+        Bus::assertDispatched(DevLinkInstall::class, function (DevLinkInstall $job) use ($operationId) {
+            return $job->type === DevLinkInstall::TYPE_IMPORT_ASSET
+                && $job->operationId === $operationId;
+        });
+    }
+
+    public function testInstallEndpointGeneratesOperationIdWhenMissing()
+    {
+        Bus::fake();
+
+        $devLink = DevLink::factory()->create();
+        $response = $this->apiCall(
+            'POST',
+            route('api.devlink.install-remote-asset', ['devLink' => $devLink->id]),
+            [
+                'id' => 456,
+                'class' => Screen::class,
+            ]
+        );
+
+        $response->assertOk()->assertExactJson(['status' => 'queued']);
+        Bus::assertDispatched(DevLinkInstall::class, function (DevLinkInstall $job) {
+            return Str::isUuid($job->operationId);
+        });
+    }
 }
diff --git a/tests/Feature/ImportExport/LoggerTest.php b/tests/Feature/ImportExport/LoggerTest.php
new file mode 100644
index 0000000000..4da4ae3cdc
--- /dev/null
+++ b/tests/Feature/ImportExport/LoggerTest.php
@@ -0,0 +1,52 @@
+<?php
+
+namespace Tests\Feature\ImportExport;
+
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Storage;
+use PHPUnit\Framework\Attributes\DataProvider;
+use ProcessMaker\Events\ImportLog;
+use ProcessMaker\ImportExport\Logger;
+use Tests\TestCase;
+
+class LoggerTest extends TestCase
+{
+    #[DataProvider('messageMethods')]
+    public function testMessagesIncludeOperationId($method, $expectedType)
+    {
+        Event::fake([ImportLog::class]);
+        Storage::fake('local');
+
+        $logger = new Logger(123, 'operation-123');
+        $logger->{$method}('Test message');
+
+        Event::assertDispatched(ImportLog::class, function (ImportLog $event) use ($expectedType) {
+            return $event->userId === 123
+                && $event->type === $expectedType
+                && $event->message === 'Test message'
+                && $event->operationId === 'operation-123';
+        });
+    }
+
+    public static function messageMethods(): array
+    {
+        return [
+            'log' => ['log', 'log'],
+            'warning' => ['warn', 'warn'],
+            'error' => ['error', 'error'],
+            'status' => ['status', 'status'],
+        ];
+    }
+
+    public function testOperationIdRemainsOptional()
+    {
+        Event::fake([ImportLog::class]);
+        Storage::fake('local');
+
+        (new Logger(123))->status('Test message');
+
+        Event::assertDispatched(ImportLog::class, function (ImportLog $event) {
+            return $event->operationId === null;
+        });
+    }
+}
diff --git a/tests/Feature/Jobs/DevLinkInstallTest.php b/tests/Feature/Jobs/DevLinkInstallTest.php
new file mode 100644
index 0000000000..7d13f6b493
--- /dev/null
+++ b/tests/Feature/Jobs/DevLinkInstallTest.php
@@ -0,0 +1,48 @@
+<?php
+
+namespace Tests\Feature\Jobs;
+
+use Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Event;
+use Illuminate\Support\Facades\Storage;
+use Mockery;
+use ProcessMaker\Events\ImportLog;
+use ProcessMaker\Jobs\DevLinkInstall;
+use ProcessMaker\Jobs\ImportV2;
+use ProcessMaker\Models\Bundle;
+use RuntimeException;
+use Tests\TestCase;
+
+class DevLinkInstallTest extends TestCase
+{
+    public function testFailedJobIncludesOperationIdInErrorEvent()
+    {
+        Event::fake([ImportLog::class]);
+        Storage::fake('local');
+
+        $lock = Mockery::mock();
+        $lock->shouldReceive('forceRelease')->once();
+        Cache::shouldReceive('lock')
+            ->once()
+            ->with(ImportV2::CACHE_LOCK_KEY)
+            ->andReturn($lock);
+
+        $job = new DevLinkInstall(
+            123,
+            456,
+            Bundle::class,
+            789,
+            DevLinkInstall::MODE_UPDATE,
+            DevLinkInstall::TYPE_INSTALL_BUNDLE,
+            'operation-123',
+        );
+
+        $job->failed(new RuntimeException('Installation failed'));
+
+        Event::assertDispatched(ImportLog::class, function (ImportLog $event) {
+            return $event->type === 'error'
+                && str_contains($event->message, 'Installation failed')
+                && $event->operationId === 'operation-123';
+        });
+    }
+}

From 052f28ccf18264e40b45dc8ff0c9ceb8b04916e6 Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Thu, 23 Jul 2026 12:37:44 -0600
Subject: [PATCH 25/52] FOUR-32329: Handle unavailable assets in DevLink
 bundles

---
 .../Exception/BundleIntegrityException.php    | 45 +++++++++++
 .../DevLinkRemoteBundleException.php          | 25 ++++++
 .../Controllers/Api/DevLinkController.php     |  9 +++
 ProcessMaker/Jobs/DevLinkInstall.php          | 12 ++-
 ProcessMaker/Models/Bundle.php                | 18 +++++
 ProcessMaker/Models/BundleAsset.php           | 78 ++++++++++++++++---
 ProcessMaker/Models/DevLink.php               | 31 +++++---
 .../devlink/components/BundleAssetListing.vue | 31 ++++++--
 .../admin/devlink/components/BundleAssets.vue | 18 +++--
 .../admin/devlink/components/BundleDetail.vue | 63 ++++++++++++++-
 tests/Feature/Api/DevLinkTest.php             | 78 +++++++++++++++++++
 tests/Model/BundleAssetTest.php               | 53 +++++++++++++
 tests/Model/BundleTest.php                    | 63 +++++++++++++--
 tests/Model/DevLinkTest.php                   | 47 ++++++++++-
 14 files changed, 524 insertions(+), 47 deletions(-)
 create mode 100644 ProcessMaker/Exception/BundleIntegrityException.php
 create mode 100644 ProcessMaker/Exception/DevLinkRemoteBundleException.php

diff --git a/ProcessMaker/Exception/BundleIntegrityException.php b/ProcessMaker/Exception/BundleIntegrityException.php
new file mode 100644
index 0000000000..f2d8f853cd
--- /dev/null
+++ b/ProcessMaker/Exception/BundleIntegrityException.php
@@ -0,0 +1,45 @@
+<?php
+
+namespace ProcessMaker\Exception;
+
+use Illuminate\Http\JsonResponse;
+use Illuminate\Support\Collection;
+use ProcessMaker\Models\Bundle;
+use ProcessMaker\Models\BundleAsset;
+use RuntimeException;
+
+class BundleIntegrityException extends RuntimeException
+{
+    private array $invalidAssets;
+
+    public function __construct(Bundle $bundle, Collection $invalidAssets)
+    {
+        $this->invalidAssets = $invalidAssets
+            ->map(fn (BundleAsset $asset) => $asset->integrityDetails())
+            ->values()
+            ->all();
+
+        parent::__construct(__(
+            'The bundle :bundle contains unavailable assets and cannot be exported.',
+            ['bundle' => $bundle->name]
+        ));
+    }
+
+    public function invalidAssets(): array
+    {
+        return $this->invalidAssets;
+    }
+
+    public function render(): JsonResponse
+    {
+        return response()->json([
+            'error' => [
+                'code' => 422,
+                'message' => $this->getMessage(),
+            ],
+            'errors' => [
+                'assets' => $this->invalidAssets,
+            ],
+        ], 422);
+    }
+}
diff --git a/ProcessMaker/Exception/DevLinkRemoteBundleException.php b/ProcessMaker/Exception/DevLinkRemoteBundleException.php
new file mode 100644
index 0000000000..3d97f0c31c
--- /dev/null
+++ b/ProcessMaker/Exception/DevLinkRemoteBundleException.php
@@ -0,0 +1,25 @@
+<?php
+
+namespace ProcessMaker\Exception;
+
+use RuntimeException;
+use Throwable;
+
+class DevLinkRemoteBundleException extends RuntimeException
+{
+    public function __construct(array $invalidAssets, ?Throwable $previous = null)
+    {
+        $assets = collect($invalidAssets)->map(function (array $asset) {
+            $type = class_basename($asset['asset_type'] ?? 'Asset');
+            $id = $asset['asset_id'] ?? '?';
+            $bundleAssetId = $asset['bundle_asset_id'] ?? '?';
+
+            return "$type #$id (bundle asset #$bundleAssetId)";
+        })->implode(', ');
+
+        parent::__construct(__(
+            'The remote bundle contains unavailable assets: :assets. Repair the bundle on the source instance and try again.',
+            ['assets' => $assets]
+        ), 0, $previous);
+    }
+}
diff --git a/ProcessMaker/Http/Controllers/Api/DevLinkController.php b/ProcessMaker/Http/Controllers/Api/DevLinkController.php
index 29825f4d38..988cc3f4ac 100644
--- a/ProcessMaker/Http/Controllers/Api/DevLinkController.php
+++ b/ProcessMaker/Http/Controllers/Api/DevLinkController.php
@@ -424,6 +424,15 @@ private function normalizeUrl(string $url): string
 
     public function deleteBundleAsset(BundleAsset $bundleAsset)
     {
+        if (
+            !$bundleAsset->bundle->editable()
+            && $bundleAsset->integrity_status === BundleAsset::INTEGRITY_VALID
+        ) {
+            throw ValidationException::withMessages([
+                '*' => __('Only unavailable assets can be removed from an installed bundle.'),
+            ]);
+        }
+
         $bundleAsset->delete();
 
         return response()->json(['message' => 'Bundle asset association deleted.'], 200);
diff --git a/ProcessMaker/Jobs/DevLinkInstall.php b/ProcessMaker/Jobs/DevLinkInstall.php
index c30519e201..15d30ead53 100644
--- a/ProcessMaker/Jobs/DevLinkInstall.php
+++ b/ProcessMaker/Jobs/DevLinkInstall.php
@@ -9,6 +9,8 @@
 use Illuminate\Queue\SerializesModels;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Log;
+use ProcessMaker\Exception\DevLinkRemoteBundleException;
 use ProcessMaker\ImportExport\Logger;
 use ProcessMaker\Jobs\ImportV2;
 use ProcessMaker\Models\Bundle;
@@ -49,7 +51,7 @@ public function __construct(
     public function handle(): void
     {
         //log
-        \Log::info('DevLinkInstall job started: ' . $this->devLinkId);
+        Log::info('DevLinkInstall job started: ' . $this->devLinkId);
         $devLink = DevLink::findOrFail($this->devLinkId);
         $logger = new Logger($this->userId);
 
@@ -82,7 +84,13 @@ public function handle(): void
 
     public function failed(Throwable $exception): void
     {
-        (new Logger($this->userId))->exception($exception);
+        $logger = new Logger($this->userId);
+        if ($exception instanceof DevLinkRemoteBundleException) {
+            Log::error($exception->getMessage(), ['exception' => $exception]);
+            $logger->error($exception->getMessage());
+        } else {
+            $logger->exception($exception);
+        }
 
         // Unlock the job
         // We can't use $this->lock->release() here because this is run in a new instance
diff --git a/ProcessMaker/Models/Bundle.php b/ProcessMaker/Models/Bundle.php
index 98f6328ab5..3971c973a3 100644
--- a/ProcessMaker/Models/Bundle.php
+++ b/ProcessMaker/Models/Bundle.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 use Illuminate\Support\Facades\Http;
+use ProcessMaker\Exception\BundleIntegrityException;
 use ProcessMaker\Exception\ExporterNotSupported;
 use ProcessMaker\Exception\ValidationException;
 use ProcessMaker\ImportExport\Importer;
@@ -78,6 +79,8 @@ public function getAssetCountAttribute()
 
     public function export()
     {
+        $this->assertIntegrity();
+
         $exports = [];
 
         foreach ($this->assets as $bundleAsset) {
@@ -93,6 +96,21 @@ public function export()
         return $exports;
     }
 
+    public function invalidAssets()
+    {
+        return $this->assets->filter(
+            fn (BundleAsset $asset) => $asset->integrity_status !== BundleAsset::INTEGRITY_VALID
+        );
+    }
+
+    public function assertIntegrity(): void
+    {
+        $invalidAssets = $this->invalidAssets();
+        if ($invalidAssets->isNotEmpty()) {
+            throw new BundleIntegrityException($this, $invalidAssets);
+        }
+    }
+
     public function exportSettings()
     {
         $exports = [];
diff --git a/ProcessMaker/Models/BundleAsset.php b/ProcessMaker/Models/BundleAsset.php
index d0af2d536b..979e0f4003 100644
--- a/ProcessMaker/Models/BundleAsset.php
+++ b/ProcessMaker/Models/BundleAsset.php
@@ -3,15 +3,22 @@
 namespace ProcessMaker\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Support\Str;
 use ProcessMaker\Enums\ExporterMap;
 
 class BundleAsset extends ProcessMakerModel
 {
     use HasFactory;
 
+    public const INTEGRITY_VALID = 'valid';
+
+    public const INTEGRITY_MISSING = 'missing';
+
+    public const INTEGRITY_TYPE_UNAVAILABLE = 'type_unavailable';
+
     protected $guarded = ['id'];
 
-    protected $appends = ['name', 'url', 'type', 'owner_name', 'categories'];
+    protected $appends = ['name', 'url', 'type', 'owner_name', 'categories', 'integrity_status'];
 
     const DATA_SOURCE_CLASS = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSource';
 
@@ -23,9 +30,11 @@ class BundleAsset extends ProcessMakerModel
 
     const PM_BLOCK_CLASS = 'ProcessMaker\Package\PackagePmBlocks\Models\PmBlock';
 
-    public static function canExport(ProcessMakerModel $asset)
+    public static function canExport(?ProcessMakerModel $asset)
     {
-        return method_exists($asset, 'export') && ExporterMap::getExporterClassForModel($asset);
+        return $asset !== null
+            && method_exists($asset, 'export')
+            && ExporterMap::getExporterClassForModel($asset);
     }
 
     public function bundle()
@@ -50,18 +59,30 @@ public static function makeKey(ProcessMakerModel $asset)
 
     public function getNameAttribute()
     {
+        $asset = $this->resolvedAsset();
+        if ($asset === null) {
+            return __('Missing :type #:id', [
+                'type' => $this->typeLabel(),
+                'id' => $this->asset_id,
+            ]);
+        }
+
         if (
             $this->asset_type === Screen::class ||
             $this->asset_type === Script::class
         ) {
-            return $this->asset->title;
+            return $asset->title;
         }
 
-        return $this->asset->name;
+        return $asset->name;
     }
 
     public function getUrlAttribute()
     {
+        if ($this->integrity_status !== self::INTEGRITY_VALID) {
+            return null;
+        }
+
         switch($this->asset_type) {
             case Screen::class:
                 return "/designer/screen-builder/{$this->asset_id}/edit";
@@ -110,8 +131,9 @@ public function getTypeAttribute()
 
     public function getOwnerNameAttribute()
     {
-        if ($this->asset && method_exists($this->asset, 'user') && $this->asset->user) {
-            return $this->asset->user->firstname . ' ' . $this->asset->user->lastname;
+        $asset = $this->resolvedAsset();
+        if ($asset && method_exists($asset, 'user') && $asset->user) {
+            return $asset->user->firstname . ' ' . $asset->user->lastname;
         }
 
         return null;
@@ -123,10 +145,48 @@ public function getCategoriesAttribute()
             return [];
         }
 
-        if ($this->asset && method_exists($this->asset, 'categories')) {
-            return $this->asset->categories->pluck('name')->toArray();
+        $asset = $this->resolvedAsset();
+        if ($asset && method_exists($asset, 'categories')) {
+            return $asset->categories->pluck('name')->toArray();
         }
 
         return [];
     }
+
+    public function getIntegrityStatusAttribute(): string
+    {
+        if (!class_exists($this->asset_type)) {
+            return self::INTEGRITY_TYPE_UNAVAILABLE;
+        }
+
+        return $this->resolvedAsset() === null
+            ? self::INTEGRITY_MISSING
+            : self::INTEGRITY_VALID;
+    }
+
+    public function integrityDetails(): array
+    {
+        return [
+            'bundle_asset_id' => $this->id,
+            'asset_type' => $this->asset_type,
+            'asset_id' => $this->asset_id,
+            'integrity_status' => $this->integrity_status,
+        ];
+    }
+
+    private function resolvedAsset(): ?ProcessMakerModel
+    {
+        if (!class_exists($this->asset_type)) {
+            return null;
+        }
+
+        return $this->asset;
+    }
+
+    private function typeLabel(): string
+    {
+        $type = $this->type ?? class_basename($this->asset_type);
+
+        return Str::headline($type);
+    }
 }
diff --git a/ProcessMaker/Models/DevLink.php b/ProcessMaker/Models/DevLink.php
index e7ad53939d..7637d24253 100644
--- a/ProcessMaker/Models/DevLink.php
+++ b/ProcessMaker/Models/DevLink.php
@@ -3,8 +3,10 @@
 namespace ProcessMaker\Models;
 
 use Illuminate\Database\Eloquent\Factories\HasFactory;
+use Illuminate\Http\Client\RequestException;
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Str;
+use ProcessMaker\Exception\DevLinkRemoteBundleException;
 use ProcessMaker\ImportExport\Importer;
 use ProcessMaker\ImportExport\Logger;
 use ProcessMaker\ImportExport\Options;
@@ -143,19 +145,28 @@ public function installRemoteBundle($remoteBundleId, $updateType)
 
         $this->logger->status(__('Downloading bundle from remote instance'));
 
-        $bundleInfo = $this->remoteBundle($remoteBundleId)->json();
+        try {
+            $bundleInfo = $this->remoteBundle($remoteBundleId)->json();
 
-        $bundleExport = $this->client()->get(
-            route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
-        )->json();
+            $bundleExport = $this->client()->get(
+                route('api.devlink.export-local-bundle', ['bundle' => $remoteBundleId], false)
+            )->json();
 
-        $bundleSettingsExport = $this->client()->get(
-            route('api.devlink.export-local-bundle-settings', ['bundle' => $remoteBundleId], false)
-        )->json();
+            $bundleSettingsExport = $this->client()->get(
+                route('api.devlink.export-local-bundle-settings', ['bundle' => $remoteBundleId], false)
+            )->json();
 
-        $bundleSettingsPayloads = $this->client()->get(
-            route('api.devlink.export-local-bundle-setting-payloads', ['bundle' => $remoteBundleId], false)
-        )->json();
+            $bundleSettingsPayloads = $this->client()->get(
+                route('api.devlink.export-local-bundle-setting-payloads', ['bundle' => $remoteBundleId], false)
+            )->json();
+        } catch (RequestException $exception) {
+            $invalidAssets = $exception->response->json('errors.assets');
+            if (is_array($invalidAssets) && $invalidAssets !== []) {
+                throw new DevLinkRemoteBundleException($invalidAssets, $exception);
+            }
+
+            throw $exception;
+        }
 
         $bundle = Bundle::updateOrCreate(
             [
diff --git a/resources/js/admin/devlink/components/BundleAssetListing.vue b/resources/js/admin/devlink/components/BundleAssetListing.vue
index 0fc95db08d..dafd4bfe71 100644
--- a/resources/js/admin/devlink/components/BundleAssetListing.vue
+++ b/resources/js/admin/devlink/components/BundleAssetListing.vue
@@ -18,15 +18,21 @@ const loadAssets = async () => {
   loading.value = true;
   const response = await window.ProcessMaker.apiClient.get(`/api/1.0/devlink/local-bundles/${bundleId}`);
   bundle.value = response.data;
-  items.value = response.data.assets.filter(asset => asset.type.toUpperCase() === route.params.type.toUpperCase());
+  items.value = response.data.assets.filter(
+    (asset) => asset.type && asset.type.toUpperCase() === route.params.type.toUpperCase(),
+  );
   loading.value = false;
 };
 
 const remove = async (asset) => {
-  const confirm = await vue.$bvModal.msgBoxConfirm(vue.$t('Are you sure you want to remote this asset from the bundle?'), {
-    okTitle: vue.$t('Ok'),
-    cancelTitle: vue.$t('Cancel'),
-  });
+  const confirm = await vue.$bvModal.msgBoxConfirm(
+    vue.$t('Remove this association from the bundle? The underlying asset will not be deleted.'),
+    {
+      okTitle: vue.$t('Remove from bundle'),
+      okVariant: 'danger',
+      cancelTitle: vue.$t('Cancel'),
+    },
+  );
   if (!confirm) {
     return;
   }
@@ -108,12 +114,23 @@ const fields = [
             class="asset-listing-table"
           >
             <template #cell(name)="data">
-              <a :href="data.item.url">{{ data.item.name }}</a>
+              <a
+                v-if="data.item.integrity_status === 'valid'"
+                :href="data.item.url"
+              >
+                {{ data.item.name }}
+              </a>
+              <span v-else>
+                {{ data.item.name }}
+                <b-badge variant="warning">
+                  {{ $t('Unavailable') }}
+                </b-badge>
+              </span>
             </template>
             <template #cell(menu)="data">
               <div class="btn-menu-container">
                 <button
-                  v-if="bundle.remote_id === null"
+                  v-if="bundle.remote_id === null || data.item.integrity_status !== 'valid'"
                   class="btn install-asset-btn"
                   @click.prevent="remove(data.item)"
                 >
diff --git a/resources/js/admin/devlink/components/BundleAssets.vue b/resources/js/admin/devlink/components/BundleAssets.vue
index b0d4e28bc7..d3a975aedc 100644
--- a/resources/js/admin/devlink/components/BundleAssets.vue
+++ b/resources/js/admin/devlink/components/BundleAssets.vue
@@ -34,17 +34,19 @@ const props = defineProps({
 
 defineEmits(['view']);
 
-const getAssetCount = (type) => {
-  return props.assets?.filter(asset => asset.type.toUpperCase() === type.toUpperCase()).length;
-};
+const getAssetCount = (type) => props.assets?.filter(
+  (asset) => asset.type && asset.type.toUpperCase() === type.toUpperCase(),
+).length;
 
 const navigate = (type) => {
-  router.push({ 
-    name: 'bundle-asset-listing', 
+  router.push({
+    name: 'bundle-asset-listing',
     params: { type: type.type },
-    state: { assets: props.assets.filter(asset => 
-      asset.type.toUpperCase() === type.type.toUpperCase()
-    )}
+    state: {
+      assets: props.assets.filter(
+        (asset) => asset.type && asset.type.toUpperCase() === type.type.toUpperCase(),
+      ),
+    },
   });
 };
 </script>
diff --git a/resources/js/admin/devlink/components/BundleDetail.vue b/resources/js/admin/devlink/components/BundleDetail.vue
index fe2f7d822d..0baae8fd67 100644
--- a/resources/js/admin/devlink/components/BundleDetail.vue
+++ b/resources/js/admin/devlink/components/BundleDetail.vue
@@ -38,7 +38,7 @@
         <button
           v-if="bundle.dev_link_id !== null"
           class="btn btn-outline-secondary mr-2 dropdown-toggle"
-          :disabled="remoteAvailable !== true"
+          :disabled="remoteAvailable !== true || invalidAssets.length > 0"
           data-toggle="dropdown"
           data-offset="5, 5"
           aria-haspopup="true"
@@ -82,6 +82,7 @@
           v-if="bundle.dev_link_id === null"
           variant="primary"
           class="btn-publish"
+          :disabled="invalidAssets.length > 0"
           @click="publishBundle"
         >
           {{ $t('Publish') }}
@@ -89,6 +90,34 @@
       </div>
     </div>
 
+    <b-alert
+      v-if="invalidAssets.length > 0"
+      show
+      variant="warning"
+      class="integrity-alert"
+    >
+      <strong>{{ $t('This bundle contains unavailable assets and cannot be exported.') }}</strong>
+      <p class="mb-2">
+        {{ $t('Remove the unavailable associations from the bundle before trying again. The underlying assets will not be deleted.') }}
+      </p>
+      <ul class="mb-0 pl-3">
+        <li
+          v-for="asset in invalidAssets"
+          :key="asset.id"
+          class="integrity-asset"
+        >
+          <span>{{ asset.name }}</span>
+          <b-button
+            size="sm"
+            variant="outline-danger"
+            @click.prevent="removeInvalidAsset(asset)"
+          >
+            {{ $t('Remove from bundle') }}
+          </b-button>
+        </li>
+      </ul>
+    </b-alert>
+
     <!-- Description -->
     <div class="description-section">
       <div class="description-section-title">
@@ -218,6 +247,29 @@ const confirmPublishNewVersionText = computed(() => vue.$t(
   { bundleName: bundle.value?.name },
 ));
 
+const invalidAssets = computed(
+  () => bundle.value?.assets?.filter((asset) => asset.integrity_status !== "valid") || [],
+);
+
+const removeInvalidAsset = async (asset) => {
+  const confirm = await vue.$bvModal.msgBoxConfirm(
+    vue.$t("Remove this unavailable association from the bundle? The underlying asset will not be deleted."),
+    {
+      okTitle: vue.$t("Remove from bundle"),
+      okVariant: "danger",
+      cancelTitle: vue.$t("Cancel"),
+    },
+  );
+  if (!confirm) {
+    return;
+  }
+
+  await window.ProcessMaker.apiClient.delete(
+    `/api/1.0/devlink/local-bundles/assets/${asset.id}`,
+  );
+  await loadAssets();
+};
+
 const publishBundle = () => {
   selected.value = bundle.value;
   confirmPublishNewVersion.value.show();
@@ -277,6 +329,15 @@ width: 100%;
 .btn-publish {
   width: 104px;
 }
+.integrity-alert {
+  margin: 16px 24px;
+}
+.integrity-asset {
+  align-items: center;
+  display: flex;
+  justify-content: space-between;
+  margin-top: 8px;
+}
 .icon-button {
   background-color: #E9ECF1;
   width: 40px;
diff --git a/tests/Feature/Api/DevLinkTest.php b/tests/Feature/Api/DevLinkTest.php
index f0a0af7b0e..2d9c244d92 100644
--- a/tests/Feature/Api/DevLinkTest.php
+++ b/tests/Feature/Api/DevLinkTest.php
@@ -8,7 +8,9 @@
 use PHPUnit\Framework\Attributes\DataProvider;
 use ProcessMaker\Http\Controllers\Api\DevLinkController;
 use ProcessMaker\Models\Bundle;
+use ProcessMaker\Models\BundleAsset;
 use ProcessMaker\Models\DevLink;
+use ProcessMaker\Models\Process;
 use ProcessMaker\Models\Screen;
 use ProcessMaker\Package\PackageDynamicUI\Models\Dashboard;
 use ProcessMaker\Package\PackageDynamicUI\Models\Menu;
@@ -257,6 +259,82 @@ public function testShowBundle()
         $this->assertEquals($bundle->id, $response->json()['id']);
     }
 
+    public function testShowBundleReportsUnavailableAssetsWithoutFailing()
+    {
+        $bundle = Bundle::factory()->create();
+        $missingProcessId = Process::max('id') + 1000;
+        $bundleAsset = BundleAsset::factory()->create([
+            'bundle_id' => $bundle->id,
+            'asset_type' => Process::class,
+            'asset_id' => $missingProcessId,
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.local-bundle', ['bundle' => $bundle->id]));
+
+        $response->assertOk()
+            ->assertJsonPath('assets.0.id', $bundleAsset->id)
+            ->assertJsonPath('assets.0.name', "Missing Process #$missingProcessId")
+            ->assertJsonPath('assets.0.url', null)
+            ->assertJsonPath('assets.0.integrity_status', BundleAsset::INTEGRITY_MISSING);
+    }
+
+    public function testExportBundleRejectsUnavailableAssets()
+    {
+        $bundle = Bundle::factory()->create(['name' => 'Corrupt Bundle']);
+        $missingProcessId = Process::max('id') + 1000;
+        $bundleAsset = BundleAsset::factory()->create([
+            'bundle_id' => $bundle->id,
+            'asset_type' => Process::class,
+            'asset_id' => $missingProcessId,
+        ]);
+
+        $response = $this->apiCall('GET', route('api.devlink.export-local-bundle', [
+            'bundle' => $bundle->id,
+        ]));
+
+        $response->assertStatus(422)
+            ->assertJsonPath('error.code', 422)
+            ->assertJsonPath(
+                'error.message',
+                'The bundle Corrupt Bundle contains unavailable assets and cannot be exported.'
+            )
+            ->assertJsonPath('errors.assets.0.bundle_asset_id', $bundleAsset->id)
+            ->assertJsonPath('errors.assets.0.asset_type', Process::class)
+            ->assertJsonPath('errors.assets.0.asset_id', $missingProcessId)
+            ->assertJsonPath('errors.assets.0.integrity_status', BundleAsset::INTEGRITY_MISSING);
+    }
+
+    public function testInstalledBundleAllowsRemovingOnlyUnavailableAssets()
+    {
+        $devLink = DevLink::factory()->create();
+        $bundle = Bundle::factory()->create([
+            'dev_link_id' => $devLink->id,
+            'remote_id' => 123,
+        ]);
+        $screen = Screen::factory()->create();
+        $validBundleAsset = BundleAsset::factory()->create([
+            'bundle_id' => $bundle->id,
+            'asset_type' => Screen::class,
+            'asset_id' => $screen->id,
+        ]);
+        $missingProcessId = Process::max('id') + 1000;
+        $invalidBundleAsset = BundleAsset::factory()->create([
+            'bundle_id' => $bundle->id,
+            'asset_type' => Process::class,
+            'asset_id' => $missingProcessId,
+        ]);
+
+        $this->apiCall('DELETE', route('api.devlink.delete-bundle-asset', [
+            'bundle_asset' => $validBundleAsset->id,
+        ]))->assertStatus(422);
+        $this->assertDatabaseHas('bundle_assets', ['id' => $validBundleAsset->id]);
+
+        $this->apiCall('DELETE', route('api.devlink.delete-bundle-asset', [
+            'bundle_asset' => $invalidBundleAsset->id,
+        ]))->assertOk();
+        $this->assertDatabaseMissing('bundle_assets', ['id' => $invalidBundleAsset->id]);
+    }
+
     public function testGetBundleAllSettingsReturnsDashboardAndMenuOptions()
     {
         if (!hasPackage('package-dynamic-ui')) {
diff --git a/tests/Model/BundleAssetTest.php b/tests/Model/BundleAssetTest.php
index 88aa6b0184..42179b1042 100644
--- a/tests/Model/BundleAssetTest.php
+++ b/tests/Model/BundleAssetTest.php
@@ -6,6 +6,7 @@
 use ProcessMaker\Models\Bundle;
 use ProcessMaker\Models\BundleAsset;
 use ProcessMaker\Models\Group;
+use ProcessMaker\Models\Process;
 use ProcessMaker\Models\Screen;
 use Tests\TestCase;
 
@@ -16,6 +17,7 @@ public function testCanExport()
         $screen = Screen::factory()->create();
 
         $this->assertTrue(BundleAsset::canExport($screen));
+        $this->assertFalse(BundleAsset::canExport(null));
     }
 
     public function testExporterNotSupported()
@@ -26,4 +28,55 @@ public function testExporterNotSupported()
         $this->expectException(ExporterNotSupported::class);
         $bundle->addAsset($group);
     }
+
+    public function testMissingAssetCanBeSerialized()
+    {
+        $bundle = Bundle::factory()->create();
+        $missingProcessId = Process::max('id') + 1000;
+        $bundleAsset = BundleAsset::factory()->create([
+            'bundle_id' => $bundle->id,
+            'asset_type' => Process::class,
+            'asset_id' => $missingProcessId,
+        ]);
+
+        $serialized = $bundleAsset->toArray();
+
+        $this->assertSame(BundleAsset::INTEGRITY_MISSING, $serialized['integrity_status']);
+        $this->assertSame("Missing Process #$missingProcessId", $serialized['name']);
+        $this->assertNull($serialized['url']);
+        $this->assertNull($serialized['owner_name']);
+        $this->assertSame([], $serialized['categories']);
+    }
+
+    public function testUnavailableAssetTypeCanBeSerialized()
+    {
+        $bundleAsset = BundleAsset::factory()->create([
+            'asset_type' => 'ProcessMaker\Missing\Asset',
+            'asset_id' => 1234,
+        ]);
+
+        $serialized = $bundleAsset->toArray();
+
+        $this->assertSame(BundleAsset::INTEGRITY_TYPE_UNAVAILABLE, $serialized['integrity_status']);
+        $this->assertSame('Missing Asset #1234', $serialized['name']);
+        $this->assertNull($serialized['url']);
+    }
+
+    public function testDeletingAnAssetLeavesItsBundleAssociationForManualRepair()
+    {
+        $process = Process::factory()->create();
+        $bundleAsset = BundleAsset::factory()->create([
+            'asset_type' => Process::class,
+            'asset_id' => $process->id,
+        ]);
+
+        $process->delete();
+
+        $this->assertTrue($process->trashed());
+        $this->assertDatabaseHas('bundle_assets', ['id' => $bundleAsset->id]);
+        $this->assertSame(
+            BundleAsset::INTEGRITY_MISSING,
+            $bundleAsset->refresh()->integrity_status
+        );
+    }
 }
diff --git a/tests/Model/BundleTest.php b/tests/Model/BundleTest.php
index d0bee366ee..aa85265b30 100644
--- a/tests/Model/BundleTest.php
+++ b/tests/Model/BundleTest.php
@@ -3,6 +3,7 @@
 namespace Tests\Model;
 
 use Illuminate\Support\Facades\Storage;
+use ProcessMaker\Exception\BundleIntegrityException;
 use ProcessMaker\ImportExport\Exporters\ScreenExporter;
 use ProcessMaker\ImportExport\Logger;
 use ProcessMaker\Models\Bundle;
@@ -17,6 +18,10 @@ class BundleTest extends TestCase
 {
     use HelperTrait;
 
+    private const ALPHA_DASHBOARD_NAME = 'Alpha Dashboard';
+
+    private const ALPHA_MENU_NAME = 'Alpha Menu';
+
     public function testExport()
     {
         $this->addGlobalSignalProcess();
@@ -44,6 +49,52 @@ public function testExport()
         $this->assertEquals($screen->title, $payload[1]['name']);
     }
 
+    public function testExportRejectsBundleWithUnavailableAssetsBeforeExporting()
+    {
+        $bundle = Bundle::factory()->create(['name' => 'Corrupt Bundle']);
+        $screen = Screen::factory()->create();
+        $missingProcessId = Process::max('id') + 1000;
+        BundleAsset::factory()->create([
+            'bundle_id' => $bundle->id,
+            'asset_type' => Screen::class,
+            'asset_id' => $screen->id,
+        ]);
+        $missingBundleAsset = BundleAsset::factory()->create([
+            'bundle_id' => $bundle->id,
+            'asset_type' => Process::class,
+            'asset_id' => $missingProcessId,
+        ]);
+        $unavailableBundleAsset = BundleAsset::factory()->create([
+            'bundle_id' => $bundle->id,
+            'asset_type' => 'ProcessMaker\Missing\Asset',
+            'asset_id' => 1234,
+        ]);
+
+        try {
+            $bundle->export();
+            $this->fail('Expected bundle integrity validation to fail.');
+        } catch (BundleIntegrityException $exception) {
+            $this->assertSame(
+                'The bundle Corrupt Bundle contains unavailable assets and cannot be exported.',
+                $exception->getMessage()
+            );
+            $this->assertSame([
+                [
+                    'bundle_asset_id' => $missingBundleAsset->id,
+                    'asset_type' => Process::class,
+                    'asset_id' => $missingProcessId,
+                    'integrity_status' => BundleAsset::INTEGRITY_MISSING,
+                ],
+                [
+                    'bundle_asset_id' => $unavailableBundleAsset->id,
+                    'asset_type' => 'ProcessMaker\Missing\Asset',
+                    'asset_id' => 1234,
+                    'integrity_status' => BundleAsset::INTEGRITY_TYPE_UNAVAILABLE,
+                ],
+            ], $exception->invalidAssets());
+        }
+    }
+
     public function testSyncAssets()
     {
         $screen1 = Screen::factory()->create(['title' => 'Screen 1']);
@@ -166,8 +217,8 @@ public function testSettingPreviewUsesInstalledPayloadMetadata()
         $bundle->savePayloadsToFile([], [[
             self::settingPayload('dashboard_package', 'dashboard-zulu', 'Zulu Dashboard'),
             self::settingPayload('menu_package', 'menu-bravo', 'Bravo Menu'),
-            self::settingPayload('dashboard_package', 'dashboard-alpha', 'Alpha Dashboard'),
-            self::settingPayload('menu_package', 'menu-alpha', 'Alpha Menu'),
+            self::settingPayload('dashboard_package', 'dashboard-alpha', self::ALPHA_DASHBOARD_NAME),
+            self::settingPayload('menu_package', 'menu-alpha', self::ALPHA_MENU_NAME),
         ]]);
 
         $this->assertTrue($bundle->newestVersionFile()->getCustomProperty('settings_payloads_complete'));
@@ -177,7 +228,7 @@ public function testSettingPreviewUsesInstalledPayloadMetadata()
             'selection' => 'partial',
             'available' => true,
             'items' => [
-                ['key' => 'dashboard-alpha', 'name' => 'Alpha Dashboard'],
+                ['key' => 'dashboard-alpha', 'name' => self::ALPHA_DASHBOARD_NAME],
                 ['key' => 'dashboard-zulu', 'name' => 'Zulu Dashboard'],
             ],
         ], $bundle->settingPreview('ui_dashboards'));
@@ -187,7 +238,7 @@ public function testSettingPreviewUsesInstalledPayloadMetadata()
             'selection' => 'all',
             'available' => true,
             'items' => [
-                ['key' => 'menu-alpha', 'name' => 'Alpha Menu'],
+                ['key' => 'menu-alpha', 'name' => self::ALPHA_MENU_NAME],
                 ['key' => 'menu-bravo', 'name' => 'Bravo Menu'],
             ],
         ], $bundle->settingPreview('ui_menus'));
@@ -213,8 +264,8 @@ public function testSettingPreviewIsUnavailableForUnmarkedLegacySnapshot()
         $bundle->addSettings('ui_dashboards', null);
         $bundle->addSettings('ui_menus', json_encode(['id' => [9001]]));
         $bundle->addMediaFromString(gzencode(json_encode([
-            self::settingPayload('dashboard_package', 'dashboard-alpha', 'Alpha Dashboard'),
-            self::settingPayload('menu_package', 'menu-alpha', 'Alpha Menu'),
+            self::settingPayload('dashboard_package', 'dashboard-alpha', self::ALPHA_DASHBOARD_NAME),
+            self::settingPayload('menu_package', 'menu-alpha', self::ALPHA_MENU_NAME),
         ])))
             ->usingFileName('payloads.json.gz')
             ->withCustomProperties(['version' => $bundle->version])
diff --git a/tests/Model/DevLinkTest.php b/tests/Model/DevLinkTest.php
index dc6ca7e332..f0efaf12d3 100644
--- a/tests/Model/DevLinkTest.php
+++ b/tests/Model/DevLinkTest.php
@@ -4,6 +4,7 @@
 
 use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Storage;
+use ProcessMaker\Exception\DevLinkRemoteBundleException;
 use ProcessMaker\Models\Bundle;
 use ProcessMaker\Models\DevLink;
 use ProcessMaker\Models\Screen;
@@ -23,6 +24,10 @@ class DevLinkTest extends TestCase
 
     private const SECOND_MENU_DESCRIPTION = 'Second menu description';
 
+    private const LOCAL_BUNDLE_API_PATH = 'local-bundles/123';
+
+    private const EXPORT_LOCAL_BUNDLE_API_PATH = 'export-local-bundle/123';
+
     public function testGetClientUrl()
     {
         $devLink = DevLink::factory()->create([
@@ -86,8 +91,8 @@ public function testInstallRemoteBundle()
         $bundle->delete();
 
         Http::fake([
-            self::remoteApiUrl('local-bundles/123') => Http::response(self::remoteBundleResponse('5')),
-            self::remoteApiUrl('export-local-bundle/123') => Http::response([
+            self::remoteApiUrl(self::LOCAL_BUNDLE_API_PATH) => Http::response(self::remoteBundleResponse('5')),
+            self::remoteApiUrl(self::EXPORT_LOCAL_BUNDLE_API_PATH) => Http::response([
                 'payloads' => $exports,
             ]),
             self::remoteApiUrl('export-local-bundle/123/settings') => Http::response([
@@ -123,6 +128,40 @@ public function testInstallRemoteBundle()
         $this->assertCount(3, $payloads);
     }
 
+    public function testInstallRemoteBundleReportsUnavailableRemoteAssets()
+    {
+        Http::preventStrayRequests();
+        Http::fake([
+            self::remoteApiUrl(self::LOCAL_BUNDLE_API_PATH) => Http::response(self::remoteBundleResponse('5')),
+            self::remoteApiUrl(self::EXPORT_LOCAL_BUNDLE_API_PATH) => Http::response([
+                'error' => [
+                    'code' => 422,
+                    'message' => 'The bundle contains unavailable assets.',
+                ],
+                'errors' => [
+                    'assets' => [[
+                        'bundle_asset_id' => 34,
+                        'asset_type' => 'ProcessMaker\Plugins\Collections\Models\Collection',
+                        'asset_id' => 20,
+                        'integrity_status' => 'missing',
+                    ]],
+                ],
+            ], 422),
+        ]);
+
+        $devLink = DevLink::factory()->create([
+            'url' => self::REMOTE_INSTANCE_URL,
+        ]);
+
+        $this->expectException(DevLinkRemoteBundleException::class);
+        $this->expectExceptionMessage(
+            'The remote bundle contains unavailable assets: Collection #20 (bundle asset #34). ' .
+            'Repair the bundle on the source instance and try again.'
+        );
+
+        $devLink->installRemoteBundle(123, 'update');
+    }
+
     public function testInstallRemoteBundleImportsAndReinstallsEverySelectedMenu()
     {
         if (!hasPackage('package-dynamic-ui')) {
@@ -310,13 +349,13 @@ public function testUpdateBundle()
         ]);
 
         Http::fake([
-            self::remoteApiUrl('local-bundles/123') => Http::sequence()
+            self::remoteApiUrl(self::LOCAL_BUNDLE_API_PATH) => Http::sequence()
                 ->push(self::remoteBundleResponse('2'), 200)
                 ->push(self::remoteBundleResponse('3'), 200)
                 ->push(self::remoteBundleResponse('4'), 200)
                 ->push(self::remoteBundleResponse('8'), 200)
                 ->push(self::remoteBundleResponse('9'), 200),
-            self::remoteApiUrl('export-local-bundle/123') => Http::sequence()
+            self::remoteApiUrl(self::EXPORT_LOCAL_BUNDLE_API_PATH) => Http::sequence()
                 ->push([
                     'payloads' => $exports,
                 ], 200)

From 46df95a1d270462f1b303c3aa930a34940b4a75f Mon Sep 17 00:00:00 2001
From: Eleazar Resendez <eleazar.resendez@processmaker.com>
Date: Mon, 27 Jul 2026 09:30:41 -0600
Subject: [PATCH 26/52] FOUR-32397: Add Smart Extract configuration fallback

---
 ProcessMaker/ScriptRunners/Base.php           | 12 ++++
 .../ScriptMicroserviceRunner.php              | 13 +++-
 .../Services/SmartExtractConfiguration.php    | 29 +++++++-
 .../SmartExtractEnvironmentVariablesTest.php  | 71 +++++++++++++++++++
 .../SmartExtractConfigurationTest.php         | 59 +++++++++++++++
 5 files changed, 180 insertions(+), 4 deletions(-)

diff --git a/ProcessMaker/ScriptRunners/Base.php b/ProcessMaker/ScriptRunners/Base.php
index f24d4e2a0f..8d6b767053 100644
--- a/ProcessMaker/ScriptRunners/Base.php
+++ b/ProcessMaker/ScriptRunners/Base.php
@@ -12,6 +12,7 @@
 use ProcessMaker\Models\ScriptDockerNayraTrait;
 use ProcessMaker\Models\ScriptExecutor;
 use ProcessMaker\Models\User;
+use ProcessMaker\Services\SmartExtractConfiguration;
 use RuntimeException;
 
 abstract class Base
@@ -177,6 +178,10 @@ private function getEnvironmentVariables($useEscape = true)
             foreach ($variables as $variable) {
                 // Fix variables that have spaces
                 $variable['name'] = str_replace(' ', '_', $variable['name']);
+                if ($variable['name'] === SmartExtractConfiguration::API_HOST) {
+                    continue;
+                }
+
                 if ($useEscape) {
                     $variablesParameter[] = escapeshellarg($variable['name']) . '=' . escapeshellarg($variable['value']);
                 } else {
@@ -185,6 +190,13 @@ private function getEnvironmentVariables($useEscape = true)
             }
         });
 
+        $smartExtractApiHost = app(SmartExtractConfiguration::class)->apiHost();
+        if ($smartExtractApiHost !== null) {
+            $variablesParameter[] = $useEscape
+                ? SmartExtractConfiguration::API_HOST . '=' . escapeshellarg($smartExtractApiHost)
+                : SmartExtractConfiguration::API_HOST . '=' . $smartExtractApiHost;
+        }
+
         // Add the url to the host
         if ($useEscape) {
             $variablesParameter[] = 'HOST_URL=' . escapeshellarg(config('app.docker_host_url'));
diff --git a/ProcessMaker/ScriptRunners/ScriptMicroserviceRunner.php b/ProcessMaker/ScriptRunners/ScriptMicroserviceRunner.php
index ad3b4f8690..dc4d5f3a96 100644
--- a/ProcessMaker/ScriptRunners/ScriptMicroserviceRunner.php
+++ b/ProcessMaker/ScriptRunners/ScriptMicroserviceRunner.php
@@ -13,6 +13,7 @@
 use ProcessMaker\Models\Script;
 use ProcessMaker\Models\User;
 use ProcessMaker\Services\ScriptMicroserviceService;
+use ProcessMaker\Services\SmartExtractConfiguration;
 use stdClass;
 
 class ScriptMicroserviceRunner
@@ -85,10 +86,20 @@ private function getEnvironmentVariables(User $user)
         EnvironmentVariable::chunk(50, function (Collection $variables) use (&$variablesParameter) {
             foreach ($variables as $variable) {
                 // Fix variables that have spaces
-                $variablesParameter[str_replace(' ', '_', $variable->name)] = $variable->value;
+                $name = str_replace(' ', '_', $variable->name);
+                if ($name === SmartExtractConfiguration::API_HOST) {
+                    continue;
+                }
+
+                $variablesParameter[$name] = $variable->value;
             }
         });
 
+        $smartExtractApiHost = app(SmartExtractConfiguration::class)->apiHost();
+        if ($smartExtractApiHost !== null) {
+            $variablesParameter[SmartExtractConfiguration::API_HOST] = $smartExtractApiHost;
+        }
+
         // Add the url to the host
         $variablesParameter['HOST_URL'] = config('app.docker_host_url');
 
diff --git a/ProcessMaker/Services/SmartExtractConfiguration.php b/ProcessMaker/Services/SmartExtractConfiguration.php
index 5ddf03bb98..a55146c56b 100644
--- a/ProcessMaker/Services/SmartExtractConfiguration.php
+++ b/ProcessMaker/Services/SmartExtractConfiguration.php
@@ -16,6 +16,14 @@ class SmartExtractConfiguration
 
     public const HITL_ENABLED = 'SMART_EXTRACT_HITL_ENABLED';
 
+    private const CONFIG_KEYS = [
+        self::API_HOST => 'smart-extract.api_host',
+        self::CLIENT_ID => 'smart-extract.client_id',
+        self::CLIENT_SECRET => 'smart-extract.client_secret',
+        self::DASHBOARD_URL => 'smart-extract.dashboard_url',
+        self::HITL_ENABLED => 'smart-extract.hitl_enabled',
+    ];
+
     private ?array $values = null;
 
     public function apiHost(): ?string
@@ -40,9 +48,13 @@ public function dashboardUrl(): ?string
 
     public function hitlEnabled(): bool
     {
-        $value = $this->stringValue(self::HITL_ENABLED);
+        $value = $this->value(self::HITL_ENABLED);
+
+        if (is_bool($value)) {
+            return $value;
+        }
 
-        if ($value === null) {
+        if (!is_string($value)) {
             return false;
         }
 
@@ -51,11 +63,22 @@ public function hitlEnabled(): bool
 
     private function stringValue(string $name): ?string
     {
-        $value = $this->values()[$name] ?? null;
+        $value = $this->value($name);
 
         return is_string($value) && trim($value) !== '' ? $value : null;
     }
 
+    private function value(string $name): mixed
+    {
+        $values = $this->values();
+
+        if (array_key_exists($name, $values)) {
+            return $values[$name];
+        }
+
+        return config(self::CONFIG_KEYS[$name]);
+    }
+
     private function values(): array
     {
         if ($this->values !== null) {
diff --git a/tests/unit/ProcessMaker/ScriptRunners/SmartExtractEnvironmentVariablesTest.php b/tests/unit/ProcessMaker/ScriptRunners/SmartExtractEnvironmentVariablesTest.php
index 2d361a19e4..2cb283786e 100644
--- a/tests/unit/ProcessMaker/ScriptRunners/SmartExtractEnvironmentVariablesTest.php
+++ b/tests/unit/ProcessMaker/ScriptRunners/SmartExtractEnvironmentVariablesTest.php
@@ -58,6 +58,77 @@ public function test_microservice_runner_preserves_database_api_host(): void
         );
     }
 
+    public function test_both_runners_propagate_the_legacy_api_host_fallback(): void
+    {
+        config(['smart-extract.api_host' => 'https://legacy.example.com']);
+
+        $executor = ScriptExecutor::factory()->create(['language' => 'php']);
+        $localRunner = new class ($executor) extends Base {
+            public function config($code, array $dockerConfig)
+            {
+                return $dockerConfig;
+            }
+        };
+        $localMethod = new ReflectionMethod(Base::class, 'getEnvironmentVariables');
+        $localMethod->setAccessible(true);
+        $localVariables = $localMethod->invoke($localRunner, false);
+
+        $this->assertSame([
+            SmartExtractConfiguration::API_HOST . '=https://legacy.example.com',
+        ], array_values(array_filter(
+            $localVariables,
+            fn (string $variable) => str_starts_with($variable, SmartExtractConfiguration::API_HOST . '=')
+        )));
+
+        $script = Script::factory()->create(['language' => 'php']);
+        $user = User::factory()->create();
+        Cache::put('script-runner-' . $user->id, 'access-token');
+        $microserviceRunner = new ScriptMicroserviceRunner($script);
+        $microserviceMethod = new ReflectionMethod(ScriptMicroserviceRunner::class, 'getEnvironmentVariables');
+        $microserviceMethod->setAccessible(true);
+        $microserviceVariables = $microserviceMethod->invoke($microserviceRunner, $user);
+
+        $this->assertSame(
+            'https://legacy.example.com',
+            $microserviceVariables[SmartExtractConfiguration::API_HOST]
+        );
+    }
+
+    public function test_existing_empty_database_api_host_suppresses_fallback_in_both_runners(): void
+    {
+        config(['smart-extract.api_host' => 'https://legacy.example.com']);
+        EnvironmentVariable::factory()->create([
+            'name' => SmartExtractConfiguration::API_HOST,
+            'value' => '',
+        ]);
+
+        $executor = ScriptExecutor::factory()->create(['language' => 'php']);
+        $localRunner = new class ($executor) extends Base {
+            public function config($code, array $dockerConfig)
+            {
+                return $dockerConfig;
+            }
+        };
+        $localMethod = new ReflectionMethod(Base::class, 'getEnvironmentVariables');
+        $localMethod->setAccessible(true);
+        $localVariables = $localMethod->invoke($localRunner, false);
+
+        $this->assertSame([], array_values(array_filter(
+            $localVariables,
+            fn (string $variable) => str_starts_with($variable, SmartExtractConfiguration::API_HOST . '=')
+        )));
+
+        $script = Script::factory()->create(['language' => 'php']);
+        $user = User::factory()->create();
+        Cache::put('script-runner-' . $user->id, 'access-token');
+        $microserviceRunner = new ScriptMicroserviceRunner($script);
+        $microserviceMethod = new ReflectionMethod(ScriptMicroserviceRunner::class, 'getEnvironmentVariables');
+        $microserviceMethod->setAccessible(true);
+        $microserviceVariables = $microserviceMethod->invoke($microserviceRunner, $user);
+
+        $this->assertArrayNotHasKey(SmartExtractConfiguration::API_HOST, $microserviceVariables);
+    }
+
     private function createApiHost(): void
     {
         EnvironmentVariable::factory()->create([
diff --git a/tests/unit/ProcessMaker/Services/SmartExtractConfigurationTest.php b/tests/unit/ProcessMaker/Services/SmartExtractConfigurationTest.php
index bcebe58d0a..63af1793e6 100644
--- a/tests/unit/ProcessMaker/Services/SmartExtractConfigurationTest.php
+++ b/tests/unit/ProcessMaker/Services/SmartExtractConfigurationTest.php
@@ -32,6 +32,14 @@ public function test_it_loads_and_decrypts_all_values_with_one_query(): void
 
     public function test_missing_empty_and_invalid_values_fail_closed(): void
     {
+        config([
+            'smart-extract.api_host' => null,
+            'smart-extract.client_id' => null,
+            'smart-extract.client_secret' => null,
+            'smart-extract.dashboard_url' => null,
+            'smart-extract.hitl_enabled' => false,
+        ]);
+
         EnvironmentVariable::factory()->create([
             'name' => SmartExtractConfiguration::HITL_ENABLED,
             'value' => 'not-a-boolean',
@@ -50,6 +58,57 @@ public function test_missing_empty_and_invalid_values_fail_closed(): void
         $this->assertNull($configuration->dashboardUrl());
     }
 
+    public function test_missing_database_values_fall_back_to_legacy_configuration(): void
+    {
+        config([
+            'smart-extract.api_host' => 'https://legacy.example.com',
+            'smart-extract.client_id' => 'legacy-client-id',
+            'smart-extract.client_secret' => 'legacy-client-secret',
+            'smart-extract.dashboard_url' => 'https://legacy.example.com/edit.html',
+            'smart-extract.hitl_enabled' => true,
+        ]);
+
+        $configuration = new SmartExtractConfiguration();
+
+        $this->assertSame('https://legacy.example.com', $configuration->apiHost());
+        $this->assertSame('legacy-client-id', $configuration->clientId());
+        $this->assertSame('legacy-client-secret', $configuration->clientSecret());
+        $this->assertSame('https://legacy.example.com/edit.html', $configuration->dashboardUrl());
+        $this->assertTrue($configuration->hitlEnabled());
+    }
+
+    public function test_existing_database_values_never_revive_the_legacy_fallback(): void
+    {
+        config([
+            'smart-extract.api_host' => 'https://legacy.example.com',
+            'smart-extract.client_id' => 'legacy-client-id',
+            'smart-extract.client_secret' => 'legacy-client-secret',
+            'smart-extract.dashboard_url' => 'https://legacy.example.com/edit.html',
+            'smart-extract.hitl_enabled' => true,
+        ]);
+
+        foreach ([
+            SmartExtractConfiguration::API_HOST => '',
+            SmartExtractConfiguration::CLIENT_ID => null,
+            SmartExtractConfiguration::CLIENT_SECRET => false,
+            SmartExtractConfiguration::DASHBOARD_URL => '   ',
+            SmartExtractConfiguration::HITL_ENABLED => 'false',
+        ] as $name => $value) {
+            EnvironmentVariable::factory()->create([
+                'name' => $name,
+                'value' => $value,
+            ]);
+        }
+
+        $configuration = new SmartExtractConfiguration();
+
+        $this->assertNull($configuration->apiHost());
+        $this->assertNull($configuration->clientId());
+        $this->assertNull($configuration->clientSecret());
+        $this->assertNull($configuration->dashboardUrl());
+        $this->assertFalse($configuration->hitlEnabled());
+    }
+
     public function test_scoped_configuration_refreshes_on_the_next_lifecycle(): void
     {
         $apiHost = EnvironmentVariable::factory()->create([

From 5edb691636838fada53c1903b56c1597b93f9f70 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigoquelca@gmail.com>
Date: Mon, 27 Jul 2026 12:24:42 -0400
Subject: [PATCH 27/52] fix(FOUR-29427): Menu Style Discrepancy Between
 Homepage and Request View

---
 resources/js/Mobile/FilterMobile.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/resources/js/Mobile/FilterMobile.vue b/resources/js/Mobile/FilterMobile.vue
index c7452454a0..1df7b30c56 100644
--- a/resources/js/Mobile/FilterMobile.vue
+++ b/resources/js/Mobile/FilterMobile.vue
@@ -269,7 +269,7 @@ export default {
   },
 };
 </script>
-<style>
+<style scoped>
   .has-search .form-control {
     padding-left: 2.375rem;
   }

From cb7d52788294fe76220fcbaa89d68a64188e4ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?=
 <contact@julio-laura.com>
Date: Mon, 27 Jul 2026 15:02:43 -0400
Subject: [PATCH 28/52] FOUR-31416 Remove guided templates

---
 .../Console/Commands/SyncGuidedTemplates.php  |   41 -
 ProcessMaker/Console/Kernel.php               |    3 -
 ProcessMaker/Events/ProcessCompleted.php      |    5 +-
 .../Api/WizardTemplateController.php          |   42 -
 .../ProcessesCatalogueController.php          |    6 -
 ProcessMaker/Jobs/SyncGuidedTemplates.php     |  384 --
 ProcessMaker/Jobs/SyncScreenTemplates.php     |    2 +-
 ProcessMaker/Models/WizardTemplate.php        |  101 -
 ProcessMaker/Templates/ProcessTemplate.php    |   74 -
 config/services.php                           |    7 -
 .../Models/WizardTemplateFactory.php          |   26 -
 ...7_215150_create_wizard_templates_table.php |   32 -
 ...4_210217_modify_wizard_templates_table.php |   55 -
 ...te_id_column_to_wizard_templates_table.php |   27 -
 public/images/wizard-icon.svg                 |    7 -
 public/images/wizard-template-icon.svg        |    8 -
 resources/img/wizard-icon.svg                 |    7 -
 resources/img/wizard-template-icon.svg        |    8 -
 .../templates/TemplateAssetsView.vue          |    8 -
 .../components/templates/TemplateSearch.vue   |   61 +-
 .../templates/TemplateSelectCard.vue          |   18 +-
 .../templates/WizardHelperProcessModal.vue    |   67 -
 .../templates/WizardTemplateCard.vue          |   86 -
 .../templates/WizardTemplateDetails.vue       |  162 -
 .../mixins/wizardHelperProcessModal.js        |  144 -
 .../components/CatalogueEmpty.vue             |   13 +-
 .../components/ProcessCollapseInfo.vue        |   25 -
 .../components/ProcessHeader.vue              |  275 -
 .../components/ProcessInfo.vue                |   20 -
 .../components/ProcessListing.vue             |   14 -
 .../components/ProcessesCatalogue.vue         |   11 -
 .../components/WizardTemplates.vue            |   42 -
 .../components/menuCatologue.vue              |   15 +-
 .../components/optionsMenu/ProcessCounter.vue |    4 -
 .../slideProcessInfo/SlideProcessInfo.vue     |   22 -
 resources/js/templates/assets.js              |    2 -
 resources/lang/en.json                        |    1 -
 resources/sass/app.scss                       |   36 -
 resources/views/templates/assets.blade.php    |    1 -
 routes/api.php                                |    5 -
 storage/api-docs/api-docs.json                | 5692 +++++++++++++----
 tests/Feature/Api/WizardTemplatesTest.php     |   61 -
 42 files changed, 4585 insertions(+), 3035 deletions(-)
 delete mode 100644 ProcessMaker/Console/Commands/SyncGuidedTemplates.php
 delete mode 100644 ProcessMaker/Http/Controllers/Api/WizardTemplateController.php
 delete mode 100644 ProcessMaker/Jobs/SyncGuidedTemplates.php
 delete mode 100644 ProcessMaker/Models/WizardTemplate.php
 delete mode 100644 database/factories/ProcessMaker/Models/WizardTemplateFactory.php
 delete mode 100644 database/migrations/2023_11_27_215150_create_wizard_templates_table.php
 delete mode 100644 database/migrations/2023_12_04_210217_modify_wizard_templates_table.php
 delete mode 100644 database/migrations/2024_01_16_181933_add_unique_template_id_column_to_wizard_templates_table.php
 delete mode 100644 public/images/wizard-icon.svg
 delete mode 100644 public/images/wizard-template-icon.svg
 delete mode 100644 resources/img/wizard-icon.svg
 delete mode 100644 resources/img/wizard-template-icon.svg
 delete mode 100644 resources/js/components/templates/WizardHelperProcessModal.vue
 delete mode 100644 resources/js/components/templates/WizardTemplateCard.vue
 delete mode 100644 resources/js/components/templates/WizardTemplateDetails.vue
 delete mode 100644 resources/js/components/templates/mixins/wizardHelperProcessModal.js
 delete mode 100644 resources/js/processes-catalogue/components/ProcessHeader.vue
 delete mode 100644 resources/js/processes-catalogue/components/WizardTemplates.vue
 delete mode 100644 tests/Feature/Api/WizardTemplatesTest.php

diff --git a/ProcessMaker/Console/Commands/SyncGuidedTemplates.php b/ProcessMaker/Console/Commands/SyncGuidedTemplates.php
deleted file mode 100644
index 2849a9be8a..0000000000
--- a/ProcessMaker/Console/Commands/SyncGuidedTemplates.php
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-
-namespace ProcessMaker\Console\Commands;
-
-use Illuminate\Console\Command;
-use ProcessMaker\Jobs\SyncGuidedTemplates as Job;
-
-class SyncGuidedTemplates extends Command
-{
-    /**
-     * The name and signature of the console command.
-     *
-     * @var string
-     */
-    protected $signature = 'processmaker:sync-guided-templates
-                            {--queue : Queue this command to run asynchronously}';
-
-    /**
-     * The console command description.
-     *
-     * @var string
-     */
-    protected $description = 'Synchronize guided templates from a central repository';
-
-    /**
-     * Execute the console command.
-     */
-    public function handle(): int
-    {
-        if ($this->option('queue')) {
-            $randomDelay = random_int(10, 120);
-            Job::dispatch()->delay(now()->addMinutes($randomDelay));
-
-            return 0;
-        }
-
-        Job::dispatchSync();
-
-        return 0;
-    }
-}
diff --git a/ProcessMaker/Console/Kernel.php b/ProcessMaker/Console/Kernel.php
index 03fc408949..df4ce44dd8 100644
--- a/ProcessMaker/Console/Kernel.php
+++ b/ProcessMaker/Console/Kernel.php
@@ -37,9 +37,6 @@ protected function schedule(Schedule $schedule)
         $schedule->command('processmaker:sync-default-templates --queue')
                  ->daily();
 
-        $schedule->command('processmaker:sync-guided-templates --queue')
-                 ->daily();
-
         $schedule->command('processmaker:sync-screen-templates --queue')
                  ->daily();
 
diff --git a/ProcessMaker/Events/ProcessCompleted.php b/ProcessMaker/Events/ProcessCompleted.php
index 566fd59730..be95f14dae 100644
--- a/ProcessMaker/Events/ProcessCompleted.php
+++ b/ProcessMaker/Events/ProcessCompleted.php
@@ -28,10 +28,7 @@ public function __construct(ProcessRequest $processRequest)
     {
         $this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
         $this->processRequest = $processRequest;
-
-        if ($processRequest->process->asset_type !== 'GUIDED_HELPER_PROCESS') {
-            $this->endEventDestination = $processRequest->getElementDestination();
-        }
+        $this->endEventDestination = $processRequest->getElementDestination();
     }
 
     /**
diff --git a/ProcessMaker/Http/Controllers/Api/WizardTemplateController.php b/ProcessMaker/Http/Controllers/Api/WizardTemplateController.php
deleted file mode 100644
index 0e71f2b66b..0000000000
--- a/ProcessMaker/Http/Controllers/Api/WizardTemplateController.php
+++ /dev/null
@@ -1,42 +0,0 @@
-<?php
-
-namespace ProcessMaker\Http\Controllers\Api;
-
-use Illuminate\Http\Request;
-use ProcessMaker\Http\Controllers\Controller;
-use ProcessMaker\Http\Resources\ApiCollection;
-use ProcessMaker\Models\Process;
-use ProcessMaker\Models\WizardTemplate;
-
-class WizardTemplateController extends Controller
-{
-    /**
-     * Get list of wizard templates
-     */
-    public function index(Request $request): ApiCollection
-    {
-        $perPage = $request->input('per_page', 10);
-        $column = $request->input('order_by', 'id');
-        $filter = $request->input('filter', '');
-
-        $direction = $request->input('order_direction', 'asc');
-
-        $query = WizardTemplate::with('process')->filter($filter)
-            ->orderBy($column, $direction);
-
-        $data = $query->paginate($perPage);
-
-        return new ApiCollection($data);
-    }
-
-    public function getHelperProcess($wizardTemplateUuid)
-    {
-        $helperProcessID = WizardTemplate::select('helper_process_id')->where('uuid', $wizardTemplateUuid)->value('helper_process_id');
-        $start_events = Process::select('start_events')->where('id', $helperProcessID)->value('start_events');
-
-        return json_encode([
-            'helper_process_id' => $helperProcessID,
-            'start_events' => json_encode($start_events),
-        ]);
-    }
-}
diff --git a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php
index 596c5821ed..3348a20fd1 100644
--- a/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php
+++ b/ProcessMaker/Http/Controllers/ProcessesCatalogueController.php
@@ -31,12 +31,6 @@ class ProcessesCatalogueController extends Controller
 
     public function index(Request $request, Process $process = null)
     {
-        if ($request->has('guided_templates')) {
-            return redirect()->route('process.browser.index', [
-                'categoryId' => 'guided_templates',
-                'template' => $request->input('template'),
-            ]);
-        }
         $manager = app(ScreenBuilderManager::class);
         event(new ScreenBuilderStarting($manager, 'DISPLAY'));
         $launchpad = null;
diff --git a/ProcessMaker/Jobs/SyncGuidedTemplates.php b/ProcessMaker/Jobs/SyncGuidedTemplates.php
deleted file mode 100644
index a0494fcaab..0000000000
--- a/ProcessMaker/Jobs/SyncGuidedTemplates.php
+++ /dev/null
@@ -1,384 +0,0 @@
-<?php
-
-namespace ProcessMaker\Jobs;
-
-use Exception;
-use Illuminate\Bus\Queueable;
-use Illuminate\Contracts\Queue\ShouldQueue;
-use Illuminate\Foundation\Bus\Dispatchable;
-use Illuminate\Queue\InteractsWithQueue;
-use Illuminate\Queue\SerializesModels;
-use Illuminate\Support\Arr;
-use Illuminate\Support\Facades\Http;
-use Illuminate\Support\Str;
-use Log;
-use ProcessMaker\ImportExport\Importer;
-use ProcessMaker\ImportExport\Options;
-use ProcessMaker\Models\Media;
-use ProcessMaker\Models\Process;
-use ProcessMaker\Models\ProcessCategory;
-use ProcessMaker\Models\Screen;
-use ProcessMaker\Models\User;
-use ProcessMaker\Models\WizardTemplate;
-use Storage;
-
-class SyncGuidedTemplates implements ShouldQueue
-{
-    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
-
-    public $newConfigCollectionId = null;
-
-    /**
-     * Create a new job instance.
-     *
-     * @return void
-     */
-    public function __construct()
-    {
-        //
-    }
-
-    /**
-     * Execute the job.
-     * Function to handle the execution of this job when it is run.
-     * Here the function fetches guided templates list from Github and saves them to the database.
-     * @return void
-     */
-    public function handle()
-    {
-        try {
-            // Fetch configuration from the environment
-            $config = config('services.guided_templates_github');
-
-            // Build the URL to fetch the guided templates list from GitHub
-            $url = $config['base_url'] . $config['template_repo'] . '/' . $config['template_branch'] . '/index.json';
-
-            // If there are multiple categories of templates defined in the .env, separate them into an array
-            $categories = (strpos($config['template_categories'], ',') !== false)
-                ? explode(',', $config['template_categories'])
-                : [$config['template_categories']];
-
-            // Create or get the ID of the 'Guided Templates' category
-            $guidedTemplateCategoryId = ProcessCategory::firstOrCreate([
-                'name' => 'Guided Templates',
-            ], [
-                'status' => 'ACTIVE',
-                'is_system' => 1,
-            ])->getKey();
-
-            // Fetch the guided template list from Github
-            $response = Http::get($url);
-
-            // Check if the request was successful
-            if (!$response->successful()) {
-                throw new Exception('Unable to fetch guided template list.');
-            }
-
-            // Extract the JSON data from the response
-            $data = $response->json();
-
-            // Iterate over categories and templates to retrieve them
-            foreach ($data as $templateCategory => $guidedTemplates) {
-                if (!in_array($templateCategory, $categories) && !in_array('all', $categories)) {
-                    continue;
-                }
-
-                try {
-                    // Import templates from the index.json file.
-                    foreach ($guidedTemplates as $template) {
-                        $this->importTemplate($template, $config, $guidedTemplateCategoryId);
-                    }
-                } catch (Exception $e) {
-                    Log::error("Error Importing Guided Templates: {$e->getMessage()}");
-                }
-            }
-        } catch (Exception $e) {
-            Log::error("Error Syncing Guided Templates: {$e->getMessage()}");
-        }
-    }
-
-    /**
-     * Import a guided template into the database.
-     *
-     * @param array $template
-     * @param array $config
-     * @param int $guidedTemplateCategoryId
-     * @return void
-     */
-    private function importTemplate($template, $config, $guidedTemplateCategoryId)
-    {
-        // Check for template changes and determine if helper process and template process need to be imported
-        [$importHelperProcess, $importTemplateProcess] = $this->checkForTemplateChanges($template);
-
-        // Check for template asset hash changes
-        $assetsHashChanged = $this->checkForTemplateAssetChanges($template);
-
-        // Fetch payloads if necessary
-        $helperProcessPayload = $importHelperProcess ?
-            $this->fetchPayload($this->buildTemplateUrl($config, $template['helper_process'])) : null;
-        $templateProcessPayload = $importTemplateProcess ?
-            $this->fetchPayload($this->buildTemplateUrl($config, $template['template_process'])) : null;
-
-        // Update process categories for the helper process and process template
-        $this->updateProcessCategories($helperProcessPayload, $templateProcessPayload, $guidedTemplateCategoryId);
-
-        // Initialize variables for new process IDs
-        $newHelperProcessId = null;
-        $newProcessTemplateId = null;
-
-        // Import helper process if necessary and get new ID
-        if ($importHelperProcess) {
-            $newHelperProcessId = $this->importProcess($helperProcessPayload, 'GUIDED_HELPER_PROCESS');
-        }
-
-        // Import template process if necessary and get new ID
-        if ($importTemplateProcess) {
-            $newProcessTemplateId = $this->importProcess($templateProcessPayload, 'GUIDED_PROCESS_TEMPLATE');
-        }
-
-        // Update or create the guided template in the database
-        $guidedTemplate = $this->updateOrCreateGuidedTemplate($template, $newHelperProcessId, $newProcessTemplateId);
-
-        // Create a media collection for template assets
-        $mediaCollectionName = $this->createMediaCollection($guidedTemplate);
-
-        if ($assetsHashChanged) {
-            // Import template assets and associate with the media collection
-            $this->importTemplateAssets($template, $config, $mediaCollectionName, $guidedTemplate);
-        }
-
-        // Save the media collection name to the guided template and persist changes
-        $guidedTemplate->media_collection = $mediaCollectionName;
-
-        $guidedTemplate->save();
-    }
-
-    // Helper functions used within importTemplate
-    private function buildTemplateUrl($config, $templatePath)
-    {
-        // Build the URL for a template based on the configuration and template path
-        if (empty($templatePath)) {
-            return null;
-        }
-
-        return $config['base_url'] .
-            $config['template_repo'] . '/' .
-            $config['template_branch'] . '/' .
-            Str::replace('./', '', $templatePath);
-    }
-
-    private function fetchPayload($url)
-    {
-        // Fetch the JSON payload from a given URL
-        return Http::get($url)->json();
-    }
-
-    private function updateProcessCategories(&$helperProcessPayload, &$templateProcessPayload,
-    $guidedTemplateCategoryId)
-    {
-        // Update process categories for both the helper process and process template
-        if ($helperProcessPayload !== null) {
-            data_set(
-                $helperProcessPayload,
-                "export.{$helperProcessPayload['root']}.attributes.process_category_id",
-                $guidedTemplateCategoryId
-            );
-        }
-
-        if ($templateProcessPayload !== null) {
-            data_set(
-                $templateProcessPayload,
-                "export.{$templateProcessPayload['root']}.attributes.process_category_id",
-                $guidedTemplateCategoryId
-            );
-        }
-    }
-
-    private function importProcess($payload, $assetType)
-    {
-        // Import a process and return the new ID
-        $postOptions = [];
-        foreach ($payload['export'] as $key => $asset) {
-            $postOptions[$key] = [
-                'mode' => 'update',
-                'is_template' => true,
-                'asset_type' => $assetType,
-                'saveAssetsMode' => 'saveAllAssets',
-            ];
-            if (in_array($asset['type'], ['Process', 'Screen', 'Script',
-                'Collections', 'DataConnector', 'ProcessTemplates'])) {
-                $payload['export'][$key]['attributes']['asset_type'] = $assetType;
-            }
-
-            if (Arr::get($asset, 'type') === 'Screen' && Arr::get($asset, 'attributes.key') === 'interstitial') {
-                Arr::set($payload, "export.{$key}.attributes.key", null);
-            }
-        }
-
-        $options = new Options($postOptions);
-        try {
-            $importer = new Importer($payload, $options);
-            $manifest = $importer->doImport();
-            $rootLog = $manifest[$payload['root']]->log;
-
-            return $rootLog['newId'];
-        } catch (Exception $e) {
-            throw new Exception('Error: ' . $e->getMessage());
-        }
-    }
-
-    private function updateOrCreateGuidedTemplate($template, $newHelperProcessId, $newProcessTemplateId)
-    {
-        $templateDetails = $template['template_details'];
-        $uniqueTemplateId = $templateDetails['unique-template-id'];
-        $cardTitle = $templateDetails['card-title'];
-        $cardExcerpt = $templateDetails['card-excerpt'];
-        $templateDetailsJson = json_encode($templateDetails);
-
-        // Check if the wizard template exists
-        $guidedTemplate = WizardTemplate::where('unique_template_id', $uniqueTemplateId)->first();
-
-        if ($guidedTemplate) {
-            // Update existing wizard template
-            $guidedTemplate->update([
-                'name' => $cardTitle,
-                'description' => $cardExcerpt,
-                'media_collection' => '',
-                'template_details' => $templateDetailsJson,
-            ]);
-
-            if ($newHelperProcessId !== null) {
-                $guidedTemplate['helper_process_id'] = $newHelperProcessId;
-                $guidedTemplate->save();
-            }
-            if ($newProcessTemplateId !== null) {
-                $guidedTemplate['process_template_id'] = $newProcessTemplateId;
-                $guidedTemplate->save();
-            }
-        } else {
-            // Create new wizard template
-            $guidedTemplate = WizardTemplate::create([
-                'unique_template_id' => $uniqueTemplateId,
-                'name' => $cardTitle,
-                'description' => $cardExcerpt,
-                'helper_process_id' => $newHelperProcessId,
-                'process_template_id' => $newProcessTemplateId,
-                'media_collection' => '',
-                'template_details' => $templateDetailsJson,
-            ]);
-        }
-
-        return $guidedTemplate;
-    }
-
-    private function createMediaCollection($guidedTemplate)
-    {
-        // Create a media collection for template assets and return the collection name
-        $mediaCollectionName = 'wt-' . $guidedTemplate->uuid . '-media';
-        $guidedTemplate->addMediaCollection($mediaCollectionName);
-
-        return $mediaCollectionName;
-    }
-
-    private function importTemplateAssets($template, $config, $mediaCollectionName, $guidedTemplate)
-    {
-        // Clear the collection to prevent duplicate images
-        $guidedTemplate->clearMediaCollection($mediaCollectionName);
-
-        // Build asset urls
-        $templateIconUrl = $this->buildTemplateUrl($config, $template['assets']['icon']);
-        $templateCardBackgroundUrl = $this->buildTemplateUrl($config, $template['assets']['card-background']);
-        $templateListIconUrl = $this->buildTemplateUrl($config, $template['assets']['list-icon']);
-        // Import template assets and associate with the media collection
-        $this->importMedia($templateIconUrl, 'icon', $mediaCollectionName, $guidedTemplate);
-        $this->importMedia($templateCardBackgroundUrl, 'cardBackground', $mediaCollectionName, $guidedTemplate);
-        $this->importMedia($templateListIconUrl, 'listIcon', $mediaCollectionName, $guidedTemplate);
-
-        if (!empty($template['assets']['launchpad']['process-card-background'])) {
-            $templateProcessCardBackgroundUrl =
-                $this->buildTemplateUrl($config, $template['assets']['launchpad']['process-card-background']);
-            $this->importMedia($templateProcessCardBackgroundUrl, 'launchpadProcessCardBackground',
-                $mediaCollectionName, $guidedTemplate);
-        }
-
-        foreach ($template['assets']['slides'] as $slide) {
-            $templateSlideUrl = $this->buildTemplateUrl($config, $slide);
-            $this->importMedia($templateSlideUrl, 'slide', $mediaCollectionName, $guidedTemplate);
-        }
-
-        if (!empty($template['assets']['launchpad']['slides'])) {
-            foreach ($template['assets']['launchpad']['slides'] as $slide) {
-                $templateSlideUrl = $this->buildTemplateUrl($config, $slide);
-                $this->importMedia($templateSlideUrl, 'launchpadSlides', $mediaCollectionName, $guidedTemplate);
-            }
-        }
-    }
-
-    private function importMedia($assetUrl, $customProperty, $mediaCollectionName, $guidedTemplate)
-    {
-        // Import a media asset and associate it with the media collection
-        if (!is_null($assetUrl)) {
-            $guidedTemplate
-                ->addMediaFromUrl($assetUrl)
-                ->withCustomProperties(['media_type' => $customProperty])
-                ->toMediaCollection($mediaCollectionName);
-        }
-    }
-
-    private function checkForTemplateChanges($template)
-    {
-        // Initialize variables to track changes
-        $helperProcessHashChanged = true;
-        $templateProcessHashChanged = true;
-
-        // Retrieve wizard template details if it exists
-        $wizardTemplate =
-            WizardTemplate::where('unique_template_id', $template['template_details']['unique-template-id'])
-            ->select('template_details')
-            ->first();
-
-        if ($wizardTemplate) {
-            $wizardTemplateDetails = json_decode($wizardTemplate->template_details, true);
-
-            // Check if helper process hash has changed
-            if (isset($wizardTemplateDetails['helper_process_hash']) &&
-                $template['template_details']['helper_process_hash'] ===
-                $wizardTemplateDetails['helper_process_hash']) {
-                $helperProcessHashChanged = false;
-            }
-
-            // Check if template process hash has changed
-            if (isset($wizardTemplateDetails['template_process_hash']) &&
-                $template['template_details']['template_process_hash'] ===
-                $wizardTemplateDetails['template_process_hash']) {
-                $templateProcessHashChanged = false;
-            }
-        }
-
-        return [$helperProcessHashChanged, $templateProcessHashChanged];
-    }
-
-    private function checkForTemplateAssetChanges($template)
-    {
-        // Initialize variables to track changes
-        $assetHashChanged = true;
-        // Retrieve wizard template details if it exists
-        $wizardTemplate =
-            WizardTemplate::where('unique_template_id', $template['template_details']['unique-template-id'])
-            ->select('template_details')
-            ->first();
-
-        if ($wizardTemplate) {
-            $wizardTemplateDetails = json_decode($wizardTemplate->template_details, true);
-            // Check if helper process hash has changed
-            if (isset($wizardTemplateDetails['asset_hash']) &&
-                $template['template_details']['asset_hash'] ===
-                $wizardTemplateDetails['asset_hash'] ||
-                !isset($wizardTemplateDetails['asset_hash'])) {
-                $assetHashChanged = false;
-            }
-        }
-
-        return $assetHashChanged;
-    }
-}
diff --git a/ProcessMaker/Jobs/SyncScreenTemplates.php b/ProcessMaker/Jobs/SyncScreenTemplates.php
index 3ea0205fbf..0545ca6a1a 100644
--- a/ProcessMaker/Jobs/SyncScreenTemplates.php
+++ b/ProcessMaker/Jobs/SyncScreenTemplates.php
@@ -50,7 +50,7 @@ public function handle()
             if (!$config) {
                 return;
             }
-            // Build the URL to fetch the guided templates list from GitHub
+            // Build the URL to fetch the screen templates list from GitHub
             $url = $config['base_url'] . $config['template_repo'] . '/' . $config['template_branch'] . '/index.json';
 
             // If there are multiple categories of templates defined in the .env, separate them into an array
diff --git a/ProcessMaker/Models/WizardTemplate.php b/ProcessMaker/Models/WizardTemplate.php
deleted file mode 100644
index 0e09ff546e..0000000000
--- a/ProcessMaker/Models/WizardTemplate.php
+++ /dev/null
@@ -1,101 +0,0 @@
-<?php
-
-namespace ProcessMaker\Models;
-
-use Illuminate\Database\Eloquent\Factories\HasFactory;
-use Illuminate\Database\Eloquent\Relations\BelongsTo;
-use Illuminate\Support\Facades\File;
-use ProcessMaker\Models\Media;
-use ProcessMaker\Traits\HasUuids;
-use Spatie\MediaLibrary\HasMedia;
-use Spatie\MediaLibrary\InteractsWithMedia;
-
-class WizardTemplate extends ProcessMakerModel implements HasMedia
-{
-    use HasFactory;
-    use HasUuids;
-    use InteractsWithMedia;
-
-    protected $table = 'wizard_templates';
-
-    protected $fillable = [
-        'uuid',
-        'process_template_id',
-        'helper_process_id',
-        'name',
-        'description',
-        'media_collection',
-        'template_details',
-        'unique_template_id',
-    ];
-
-    protected $appends = [
-        'template_media',
-    ];
-
-    /**
-     * Get the process associated with the wizard template.
-     */
-    public function process(): BelongsTo
-    {
-        return $this->belongsTo(Process::class, 'helper_process_id');
-    }
-
-    /**
-     * Get the process template associated with the wizard template.
-     */
-    public function process_template(): BelongsTo
-    {
-        return $this->belongsTo(ProcessTemplates::class, 'process_template_id');
-    }
-
-    /**
-     * Filter settings with a string
-     *
-     * @param $query
-     *
-     * @param $filter string
-     */
-    public function scopeFilter($query, $filterStr)
-    {
-        $filter = '%' . mb_strtolower($filterStr) . '%';
-        $query->where(function ($query) use ($filter) {
-            $query->where('wizard_templates.name', 'like', $filter)
-                ->orWhere('wizard_templates.description', 'like', $filter);
-        });
-
-        return $query;
-    }
-
-    public function getTemplateMediaAttribute()
-    {
-        $mediaCollectionName = 'wt-' . $this->uuid . '-media';
-        $slides = $this->getMedia($mediaCollectionName, ['media_type' => 'slide']);
-        $slideUrls = $slides->map(function ($slide) {
-            return $slide->getFullUrl();
-        });
-        $iconMedia = $this->getMedia($mediaCollectionName, ['media_type' => 'icon'])->first();
-        $cardBackgroundMedia = $this->getMedia($mediaCollectionName, ['media_type' => 'cardBackground'])->first();
-        $listIconMedia = $this->getMedia($mediaCollectionName, ['media_type' => 'listIcon'])->first();
-
-        return [
-            'icon' => !is_null($iconMedia) ? $iconMedia->getFullUrl() : '',
-            'cardBackground' => !is_null($cardBackgroundMedia) ? $cardBackgroundMedia->getFullUrl() : '',
-            'listIcon' => !is_null($listIconMedia) ? $listIconMedia->getFullUrl() : '',
-            'slides' => $slideUrls,
-        ];
-    }
-
-    /**
-     * Add files to media collection
-     */
-    public function addFilesToMediaCollection(string $directoryPath)
-    {
-        $files = File::allFiles($directoryPath);
-        $collectionName = basename($directoryPath);
-
-        foreach ($files as $file) {
-            $this->addMedia($file->getPathname())->toMediaCollection($collectionName);
-        }
-    }
-}
diff --git a/ProcessMaker/Templates/ProcessTemplate.php b/ProcessMaker/Templates/ProcessTemplate.php
index 3d9f6f6aa4..ca24deb766 100644
--- a/ProcessMaker/Templates/ProcessTemplate.php
+++ b/ProcessMaker/Templates/ProcessTemplate.php
@@ -15,10 +15,8 @@
 use ProcessMaker\Models\Process;
 use ProcessMaker\Models\ProcessCategory;
 use ProcessMaker\Models\ProcessTemplates;
-use ProcessMaker\Models\WizardTemplate;
 use ProcessMaker\Traits\HasControllerAddons;
 use SebastianBergmann\CodeUnit\Exception;
-use Spatie\MediaLibrary\MediaCollections\Models\Media;
 
 /**
  * Summary of ProcessTemplate
@@ -257,18 +255,6 @@ public function create($request) : JsonResponse
                 $payload['export'][$key]['attributes']['name'] = $requestData['name'];
                 $payload['export'][$key]['attributes']['description'] = $requestData['description'];
                 $payload['export'][$key]['attributes']['process_category_id'] = $requestData['process_category_id'];
-                // Store the wizard template uuid on the process to rerun the helper process
-                if (isset($requestData['wizardTemplateUuid'])) {
-                    $properties = json_decode($payload['export'][$key]['attributes']['properties'], true);
-                    $properties['wizardTemplateUuid'] = $requestData['wizardTemplateUuid'];
-                    $payload['export'][$key]['attributes']['properties'] = json_encode($properties);
-                }
-                // Store the helper process request id that initiated the process creation
-                if (isset($requestData['helperProcessRequestId'])) {
-                    $properties = json_decode($payload['export'][$key]['attributes']['properties'], true);
-                    $properties['helperProcessRequestId'] = $requestData['helperProcessRequestId'];
-                    $payload['export'][$key]['attributes']['properties'] = json_encode($properties);
-                }
 
                 $payload['export'][$key]['name'] = $requestData['name'];
                 $payload['export'][$key]['description'] = $requestData['description'];
@@ -296,8 +282,6 @@ public function create($request) : JsonResponse
         $process->user_id = Auth::id();
         $process->save();
 
-        $this->syncLaunchpadAssets($request, $process);
-
         if (class_exists(self::PROJECT_ASSET_MODEL_CLASS) && !empty($requestData['projects'])) {
             $manifest = $this->getManifest('process', $processId);
 
@@ -506,64 +490,6 @@ public function existingTemplate($request) : ?array
         return null;
     }
 
-    /**
-     * Syncs launchpad assets from a guided template to the imported process.
-     *
-     * @param  Illuminate\Http\Request  $request
-     * @param  App\Models\Process  $process
-     * @return void
-     */
-    protected function syncLaunchpadAssets($request, $process)
-    {
-        if (empty($request->wizardTemplateUuid)) {
-            return;
-        }
-
-        // Add media collection for the imported process
-        $processMediaCollectionName = $process->uuid . '_images_carousel';
-        $process->addMediaCollection($processMediaCollectionName);
-
-        // Retrieve the guided template by UUID
-        $guidedTemplateUuid = $request->input('wizardTemplateUuid');
-        $template = WizardTemplate::where('uuid', $guidedTemplateUuid)->first();
-
-        // Get launchpad slides media from the guided template
-        $templateLaunchpadSlides = $template->getMedia($template->media_collection, function (Media $media) {
-            return $media->custom_properties['media_type'] === 'launchpadSlides';
-        });
-
-        // Iterate over each launchpad slide and add to the imported process media collection
-        foreach ($templateLaunchpadSlides as $slide) {
-            // Extract order index from file name
-            $orderIndex = $this->extractOrderIndexFromFileName($slide->getPath());
-
-            // Add media to the imported process collection
-            $media = $process->addMedia($slide->getPath())->preservingOriginal()->toMediaCollection($processMediaCollectionName);
-
-            // Set order column if available
-            if (!is_null($orderIndex)) {
-                $media->order_column = $orderIndex;
-                $media->save();
-            }
-        }
-    }
-
-    /**
-     * Extracts order index from the file name.
-     *
-     * @param string $fileName
-     * @return int|null
-     */
-    protected function extractOrderIndexFromFileName($fileName)
-    {
-        preg_match('/\d+/', basename($fileName), $matches);
-        if (!empty($matches)) {
-            return intval($matches[0]) - 1;
-        }
-
-        return null;
-    }
-
     /**
      * Prepare payload for import.
      *
diff --git a/config/services.php b/config/services.php
index fde93f96cd..bcf0b7b9c8 100644
--- a/config/services.php
+++ b/config/services.php
@@ -46,13 +46,6 @@
         'template_categories' => env('DEFAULT_TEMPLATE_CATEGORIES', 'accounting-and-finance,customer-success,human-resources,marketing-and-sales,operations,it'),
     ],
 
-    'guided_templates_github' => [
-        'base_url' => 'https://raw.githubusercontent.com/processmaker/',
-        'template_repo' => env('GUIDED_TEMPLATE_REPO', 'wizard-templates'),
-        'template_branch' => env('GUIDED_TEMPLATE_BRANCH', '2023-winter'),
-        'template_categories' => env('GUIDED_TEMPLATE_CATEGORIES', 'all'),
-    ],
-
     'screen_templates_github' => [
         'base_url' => 'https://raw.githubusercontent.com/processmaker/',
         'template_repo' => env('SCREEN_TEMPLATE_REPO', 'screen-templates'),
diff --git a/database/factories/ProcessMaker/Models/WizardTemplateFactory.php b/database/factories/ProcessMaker/Models/WizardTemplateFactory.php
deleted file mode 100644
index 6860dabca3..0000000000
--- a/database/factories/ProcessMaker/Models/WizardTemplateFactory.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace Database\Factories\ProcessMaker\Models;
-
-use Illuminate\Database\Eloquent\Factories\Factory;
-use ProcessMaker\Models\Process;
-use ProcessMaker\Models\WizardTemplate;
-
-class WizardTemplateFactory extends Factory
-{
-    protected $model = WizardTemplate::class;
-
-    public function definition()
-    {
-        return [
-            'uuid' => $this->faker->uuid,
-            'unique_template_id' => $this->faker->uuid,
-            'process_template_id' => null,
-            'name' => $this->faker->unique()->name(),
-            'description' => $this->faker->unique()->name(),
-            'media_collection' => $this->faker->unique()->name(),
-            'template_details' => '{}',
-            'helper_process_id' => Process::factory()->create()->id,
-        ];
-    }
-}
diff --git a/database/migrations/2023_11_27_215150_create_wizard_templates_table.php b/database/migrations/2023_11_27_215150_create_wizard_templates_table.php
deleted file mode 100644
index d7a34c4789..0000000000
--- a/database/migrations/2023_11_27_215150_create_wizard_templates_table.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class CreateWizardTemplatesTable extends Migration
-{
-    public function up()
-    {
-        Schema::create('wizard_templates', function (Blueprint $table) {
-            $table->id();
-            $table->uuid('uuid')->unique();
-            $table->unsignedBigInteger('process_template_id')->nullable();
-            $table->unsignedInteger('process_id');
-            $table->string('media_collection')->nullable();
-            $table->timestamps();
-
-            // Foreign keys
-            $table->foreign('process_id')
-                ->references('id')
-                ->on('processes')
-                ->onDelete('cascade')
-                ->constrained('processes');
-        });
-    }
-
-    public function down()
-    {
-        Schema::dropIfExists('wizard_templates');
-    }
-}
diff --git a/database/migrations/2023_12_04_210217_modify_wizard_templates_table.php b/database/migrations/2023_12_04_210217_modify_wizard_templates_table.php
deleted file mode 100644
index 776d4e4b20..0000000000
--- a/database/migrations/2023_12_04_210217_modify_wizard_templates_table.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-class ModifyWizardTemplatesTable extends Migration
-{
-    public function up()
-    {
-        // Change the process_id column to helper_process_id
-        Schema::table('wizard_templates', function (Blueprint $table) {
-            $table->renameColumn('process_id', 'helper_process_id');
-            $table->string('name')->after('uuid');
-            $table->string('description')->after('name');
-            $table->json('template_details')->after('description');
-            $table->unsignedInteger('config_collection_id')->nullable()->after('template_details');
-        });
-
-        // Change the foreign key reference to helper_process_id
-        Schema::table('wizard_templates', function (Blueprint $table) {
-            $table->foreign('helper_process_id')
-                ->references('id')
-                ->on('processes')
-                ->onDelete('cascade')
-                ->constrained('processes');
-        });
-
-        // Add the foreign key reference to process_template_id
-        Schema::table('wizard_templates', function (Blueprint $table) {
-            $table->foreign('process_template_id')
-                ->references('id')
-                ->on('process_templates')
-                ->onDelete('cascade')
-                ->constrained('process_templates');
-        });
-    }
-
-    public function down()
-    {
-        // Reverse the changes in the down method if needed
-        Schema::table('wizard_templates', function (Blueprint $table) {
-            $table->renameColumn('helper_process_id', 'process_id');
-
-            // Reverse the foreign key changes
-            $table->dropForeign(['helper_process_id']);
-            $table->dropForeign(['process_template_id']);
-
-            $table->dropColumn('name');
-            $table->dropColumn('description');
-            $table->dropColumn('template_details');
-            $table->dropColumn('config_collection_id');
-        });
-    }
-}
diff --git a/database/migrations/2024_01_16_181933_add_unique_template_id_column_to_wizard_templates_table.php b/database/migrations/2024_01_16_181933_add_unique_template_id_column_to_wizard_templates_table.php
deleted file mode 100644
index 8af6d8371b..0000000000
--- a/database/migrations/2024_01_16_181933_add_unique_template_id_column_to_wizard_templates_table.php
+++ /dev/null
@@ -1,27 +0,0 @@
-<?php
-
-use Illuminate\Database\Migrations\Migration;
-use Illuminate\Database\Schema\Blueprint;
-use Illuminate\Support\Facades\Schema;
-
-return new class extends Migration {
-    /**
-     * Run the migrations.
-     */
-    public function up(): void
-    {
-        Schema::table('wizard_templates', function (Blueprint $table) {
-            $table->string('unique_template_id')->unique()->after('uuid');
-        });
-    }
-
-    /**
-     * Reverse the migrations.
-     */
-    public function down(): void
-    {
-        Schema::table('wizard_templates', function (Blueprint $table) {
-            $table->dropColumn('unique_template_id');
-        });
-    }
-};
diff --git a/public/images/wizard-icon.svg b/public/images/wizard-icon.svg
deleted file mode 100644
index a2be69d748..0000000000
--- a/public/images/wizard-icon.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-  <path d="M5.72492 9.13551C5.72557 9.21939 5.70007 9.30139 5.65196 9.37011C5.60385 9.43882 5.53552 9.49085 5.45648 9.51895L3.83461 10.1087L3.24507 11.7301C3.21602 11.8084 3.1637 11.8759 3.09515 11.9236C3.02659 11.9712 2.94509 11.9968 2.86159 11.9968C2.77809 11.9968 2.69659 11.9712 2.62804 11.9236C2.55949 11.8759 2.50717 11.8084 2.47811 11.7301L1.88832 10.1069L0.266704 9.51895C0.188422 9.48989 0.120908 9.43758 0.0732314 9.36904C0.0255548 9.30049 0 9.219 0 9.13551C0 9.05202 0.0255548 8.97053 0.0732314 8.90198C0.120908 8.83344 0.188422 8.78113 0.266704 8.75207L1.89011 8.16235L2.47811 6.54092C2.50717 6.46265 2.55949 6.39514 2.62804 6.34747C2.69659 6.2998 2.77809 6.27425 2.86159 6.27425C2.94509 6.27425 3.02659 6.2998 3.09515 6.34747C3.1637 6.39514 3.21602 6.46265 3.24507 6.54092L3.83487 8.16414L5.45648 8.75207C5.53552 8.78017 5.60385 8.8322 5.65196 8.90092C5.70007 8.96963 5.72557 9.05163 5.72492 9.13551Z" fill="#6A7888"/>
-  <path d="M16 3.11228C16.0006 3.19602 15.9752 3.27788 15.9272 3.34648C15.8791 3.41508 15.8109 3.46702 15.732 3.49507L14.1129 4.0838L13.5243 5.70248C13.4953 5.78062 13.4431 5.84801 13.3747 5.8956C13.3062 5.94319 13.2249 5.9687 13.1415 5.9687C13.0582 5.9687 12.9768 5.94319 12.9084 5.8956C12.8399 5.84801 12.7877 5.78062 12.7587 5.70248L12.1699 4.08201L10.551 3.49507C10.4729 3.46606 10.4055 3.41384 10.3579 3.34541C10.3103 3.27698 10.2848 3.19563 10.2848 3.11228C10.2848 3.02893 10.3103 2.94758 10.3579 2.87915C10.4055 2.81072 10.4729 2.7585 10.551 2.72949L12.1717 2.14076L12.7587 0.522082C12.7877 0.443941 12.8399 0.376549 12.9084 0.328958C12.9768 0.281368 13.0582 0.255859 13.1415 0.255859C13.2249 0.255859 13.3062 0.281368 13.3747 0.328958C13.4431 0.376549 13.4953 0.443941 13.5243 0.522082L14.1131 2.14255L15.732 2.72949C15.8109 2.75754 15.8791 2.80948 15.9272 2.87808C15.9752 2.94668 16.0006 3.02854 16 3.11228Z" fill="#6A7888"/>
-  <path d="M9.02932 13.4206C9.02974 13.4758 9.01298 13.5297 8.98136 13.5748C8.94974 13.62 8.90483 13.6542 8.85288 13.6727L7.78685 14.0603L7.39935 15.126C7.38025 15.1775 7.34587 15.2218 7.30081 15.2532C7.25575 15.2845 7.20218 15.3013 7.1473 15.3013C7.09241 15.3013 7.03884 15.2845 6.99379 15.2532C6.94873 15.2218 6.91434 15.1775 6.89524 15.126L6.50758 14.0591L5.44172 13.6727C5.39026 13.6536 5.34589 13.6192 5.31455 13.5741C5.28321 13.5291 5.26642 13.4755 5.26642 13.4206C5.26642 13.3657 5.28321 13.3122 5.31455 13.2671C5.34589 13.2221 5.39026 13.1877 5.44172 13.1686L6.50876 12.781L6.89524 11.7152C6.91434 11.6638 6.94873 11.6194 6.99379 11.5881C7.03884 11.5568 7.09241 11.54 7.1473 11.54C7.20218 11.54 7.25575 11.5568 7.30081 11.5881C7.34587 11.6194 7.38025 11.6638 7.39935 11.7152L7.78702 12.7822L8.85288 13.1686C8.90483 13.1871 8.94974 13.2213 8.98136 13.2664C9.01298 13.3116 9.02974 13.3655 9.02932 13.4206Z" fill="#6A7888"/>
-  <path d="M6.77254 7.48354L9.7746 5.27704L15.3973 12.9252C15.8895 13.5947 15.7457 14.5364 15.0761 15.0285L14.4988 15.4529C13.8292 15.945 12.8874 15.8012 12.3952 15.1317L6.77254 7.48354Z" fill="#6A7888"/>
-  <path d="M9.07457 4.31113L6.18765 6.51275L4.1118 3.79137C3.60783 3.13067 3.73493 2.18657 4.39569 1.68266L4.88978 1.30586C5.55054 0.801955 6.49475 0.929059 6.99872 1.58976L9.07457 4.31113Z" fill="#6A7888"/>
-</svg>
\ No newline at end of file
diff --git a/public/images/wizard-template-icon.svg b/public/images/wizard-template-icon.svg
deleted file mode 100644
index 9ea25abd12..0000000000
--- a/public/images/wizard-template-icon.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
-    <rect width="32" height="32" rx="16" fill="white"/>
-    <path d="M12.7249 16.8797C12.7256 16.9635 12.7001 17.0455 12.652 17.1142C12.6038 17.183 12.5355 17.235 12.4565 17.2631L10.8346 17.8528L10.2451 19.4742C10.216 19.5525 10.1637 19.62 10.0951 19.6677C10.0266 19.7154 9.94509 19.7409 9.86159 19.7409C9.77809 19.7409 9.69659 19.7154 9.62804 19.6677C9.55949 19.62 9.50717 19.5525 9.47811 19.4742L8.88832 17.851L7.2667 17.2631C7.18842 17.234 7.12091 17.1817 7.07323 17.1132C7.02555 17.0446 7 16.9631 7 16.8797C7 16.7962 7.02555 16.7147 7.07323 16.6461C7.12091 16.5776 7.18842 16.5253 7.2667 16.4962L8.89011 15.9065L9.47811 14.2851C9.50717 14.2068 9.55949 14.1393 9.62804 14.0916C9.69659 14.0439 9.77809 14.0184 9.86159 14.0184C9.94509 14.0184 10.0266 14.0439 10.0951 14.0916C10.1637 14.1393 10.216 14.2068 10.2451 14.2851L10.8349 15.9083L12.4565 16.4962C12.5355 16.5243 12.6038 16.5763 12.652 16.6451C12.7001 16.7138 12.7256 16.7958 12.7249 16.8797Z" fill="#F5BC00"/>
-    <path d="M23 10.8564C23.0006 10.9402 22.9752 11.022 22.9272 11.0906C22.8791 11.1592 22.8109 11.2112 22.732 11.2392L21.1129 11.8279L20.5243 13.4466C20.4953 13.5248 20.4431 13.5922 20.3747 13.6397C20.3062 13.6873 20.2249 13.7128 20.1415 13.7128C20.0582 13.7128 19.9768 13.6873 19.9084 13.6397C19.8399 13.5922 19.7877 13.5248 19.7587 13.4466L19.1699 11.8262L17.551 11.2392C17.4729 11.2102 17.4055 11.158 17.3579 11.0896C17.3103 11.0211 17.2848 10.9398 17.2848 10.8564C17.2848 10.7731 17.3103 10.6917 17.3579 10.6233C17.4055 10.5549 17.4729 10.5026 17.551 10.4736L19.1717 9.8849L19.7587 8.26622C19.7877 8.18808 19.8399 8.12069 19.9084 8.0731C19.9768 8.02551 20.0582 8 20.1415 8C20.2249 8 20.3062 8.02551 20.3747 8.0731C20.4431 8.12069 20.4953 8.18808 20.5243 8.26622L21.1131 9.88669L22.732 10.4736C22.8109 10.5017 22.8791 10.5536 22.9272 10.6222C22.9752 10.6908 23.0006 10.7727 23 10.8564Z" fill="#F5BC00"/>
-    <path d="M16.0293 21.1648C16.0297 21.2199 16.013 21.2738 15.9814 21.319C15.9497 21.3641 15.9048 21.3983 15.8529 21.4168L14.7868 21.8044L14.3994 22.8702C14.3803 22.9216 14.3459 22.966 14.3008 22.9973C14.2558 23.0286 14.2022 23.0454 14.1473 23.0454C14.0924 23.0454 14.0388 23.0286 13.9938 22.9973C13.9487 22.966 13.9143 22.9216 13.8952 22.8702L13.5076 21.8032L12.4417 21.4168C12.3903 21.3977 12.3459 21.3633 12.3146 21.3183C12.2832 21.2732 12.2664 21.2196 12.2664 21.1648C12.2664 21.1099 12.2832 21.0563 12.3146 21.0113C12.3459 20.9662 12.3903 20.9318 12.4417 20.9127L13.5088 20.5251L13.8952 19.4594C13.9143 19.4079 13.9487 19.3636 13.9938 19.3322C14.0388 19.3009 14.0924 19.2841 14.1473 19.2841C14.2022 19.2841 14.2558 19.3009 14.3008 19.3322C14.3459 19.3636 14.3803 19.4079 14.3994 19.4594L14.787 20.5263L15.8529 20.9127C15.9048 20.9312 15.9497 20.9654 15.9814 21.0106C16.013 21.0557 16.0297 21.1096 16.0293 21.1648Z" fill="#F5BC00"/>
-    <path d="M13.7725 15.2277L16.7746 13.0212L22.3973 20.6693C22.8895 21.3388 22.7457 22.2805 22.0761 22.7727L21.4988 23.197C20.8292 23.6891 19.8874 23.5453 19.3952 22.8758L13.7725 15.2277Z" fill="#6A7888"/>
-    <path d="M16.0746 12.0553L13.1877 14.2569L11.1118 11.5355C10.6078 10.8748 10.7349 9.93071 11.3957 9.4268L11.8898 9.05C12.5505 8.5461 13.4947 8.6732 13.9987 9.3339L16.0746 12.0553Z" fill="#F5BC00"/>
-</svg>
\ No newline at end of file
diff --git a/resources/img/wizard-icon.svg b/resources/img/wizard-icon.svg
deleted file mode 100644
index a2be69d748..0000000000
--- a/resources/img/wizard-icon.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16" fill="none">
-  <path d="M5.72492 9.13551C5.72557 9.21939 5.70007 9.30139 5.65196 9.37011C5.60385 9.43882 5.53552 9.49085 5.45648 9.51895L3.83461 10.1087L3.24507 11.7301C3.21602 11.8084 3.1637 11.8759 3.09515 11.9236C3.02659 11.9712 2.94509 11.9968 2.86159 11.9968C2.77809 11.9968 2.69659 11.9712 2.62804 11.9236C2.55949 11.8759 2.50717 11.8084 2.47811 11.7301L1.88832 10.1069L0.266704 9.51895C0.188422 9.48989 0.120908 9.43758 0.0732314 9.36904C0.0255548 9.30049 0 9.219 0 9.13551C0 9.05202 0.0255548 8.97053 0.0732314 8.90198C0.120908 8.83344 0.188422 8.78113 0.266704 8.75207L1.89011 8.16235L2.47811 6.54092C2.50717 6.46265 2.55949 6.39514 2.62804 6.34747C2.69659 6.2998 2.77809 6.27425 2.86159 6.27425C2.94509 6.27425 3.02659 6.2998 3.09515 6.34747C3.1637 6.39514 3.21602 6.46265 3.24507 6.54092L3.83487 8.16414L5.45648 8.75207C5.53552 8.78017 5.60385 8.8322 5.65196 8.90092C5.70007 8.96963 5.72557 9.05163 5.72492 9.13551Z" fill="#6A7888"/>
-  <path d="M16 3.11228C16.0006 3.19602 15.9752 3.27788 15.9272 3.34648C15.8791 3.41508 15.8109 3.46702 15.732 3.49507L14.1129 4.0838L13.5243 5.70248C13.4953 5.78062 13.4431 5.84801 13.3747 5.8956C13.3062 5.94319 13.2249 5.9687 13.1415 5.9687C13.0582 5.9687 12.9768 5.94319 12.9084 5.8956C12.8399 5.84801 12.7877 5.78062 12.7587 5.70248L12.1699 4.08201L10.551 3.49507C10.4729 3.46606 10.4055 3.41384 10.3579 3.34541C10.3103 3.27698 10.2848 3.19563 10.2848 3.11228C10.2848 3.02893 10.3103 2.94758 10.3579 2.87915C10.4055 2.81072 10.4729 2.7585 10.551 2.72949L12.1717 2.14076L12.7587 0.522082C12.7877 0.443941 12.8399 0.376549 12.9084 0.328958C12.9768 0.281368 13.0582 0.255859 13.1415 0.255859C13.2249 0.255859 13.3062 0.281368 13.3747 0.328958C13.4431 0.376549 13.4953 0.443941 13.5243 0.522082L14.1131 2.14255L15.732 2.72949C15.8109 2.75754 15.8791 2.80948 15.9272 2.87808C15.9752 2.94668 16.0006 3.02854 16 3.11228Z" fill="#6A7888"/>
-  <path d="M9.02932 13.4206C9.02974 13.4758 9.01298 13.5297 8.98136 13.5748C8.94974 13.62 8.90483 13.6542 8.85288 13.6727L7.78685 14.0603L7.39935 15.126C7.38025 15.1775 7.34587 15.2218 7.30081 15.2532C7.25575 15.2845 7.20218 15.3013 7.1473 15.3013C7.09241 15.3013 7.03884 15.2845 6.99379 15.2532C6.94873 15.2218 6.91434 15.1775 6.89524 15.126L6.50758 14.0591L5.44172 13.6727C5.39026 13.6536 5.34589 13.6192 5.31455 13.5741C5.28321 13.5291 5.26642 13.4755 5.26642 13.4206C5.26642 13.3657 5.28321 13.3122 5.31455 13.2671C5.34589 13.2221 5.39026 13.1877 5.44172 13.1686L6.50876 12.781L6.89524 11.7152C6.91434 11.6638 6.94873 11.6194 6.99379 11.5881C7.03884 11.5568 7.09241 11.54 7.1473 11.54C7.20218 11.54 7.25575 11.5568 7.30081 11.5881C7.34587 11.6194 7.38025 11.6638 7.39935 11.7152L7.78702 12.7822L8.85288 13.1686C8.90483 13.1871 8.94974 13.2213 8.98136 13.2664C9.01298 13.3116 9.02974 13.3655 9.02932 13.4206Z" fill="#6A7888"/>
-  <path d="M6.77254 7.48354L9.7746 5.27704L15.3973 12.9252C15.8895 13.5947 15.7457 14.5364 15.0761 15.0285L14.4988 15.4529C13.8292 15.945 12.8874 15.8012 12.3952 15.1317L6.77254 7.48354Z" fill="#6A7888"/>
-  <path d="M9.07457 4.31113L6.18765 6.51275L4.1118 3.79137C3.60783 3.13067 3.73493 2.18657 4.39569 1.68266L4.88978 1.30586C5.55054 0.801955 6.49475 0.929059 6.99872 1.58976L9.07457 4.31113Z" fill="#6A7888"/>
-</svg>
\ No newline at end of file
diff --git a/resources/img/wizard-template-icon.svg b/resources/img/wizard-template-icon.svg
deleted file mode 100644
index 9ea25abd12..0000000000
--- a/resources/img/wizard-template-icon.svg
+++ /dev/null
@@ -1,8 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32" fill="none">
-    <rect width="32" height="32" rx="16" fill="white"/>
-    <path d="M12.7249 16.8797C12.7256 16.9635 12.7001 17.0455 12.652 17.1142C12.6038 17.183 12.5355 17.235 12.4565 17.2631L10.8346 17.8528L10.2451 19.4742C10.216 19.5525 10.1637 19.62 10.0951 19.6677C10.0266 19.7154 9.94509 19.7409 9.86159 19.7409C9.77809 19.7409 9.69659 19.7154 9.62804 19.6677C9.55949 19.62 9.50717 19.5525 9.47811 19.4742L8.88832 17.851L7.2667 17.2631C7.18842 17.234 7.12091 17.1817 7.07323 17.1132C7.02555 17.0446 7 16.9631 7 16.8797C7 16.7962 7.02555 16.7147 7.07323 16.6461C7.12091 16.5776 7.18842 16.5253 7.2667 16.4962L8.89011 15.9065L9.47811 14.2851C9.50717 14.2068 9.55949 14.1393 9.62804 14.0916C9.69659 14.0439 9.77809 14.0184 9.86159 14.0184C9.94509 14.0184 10.0266 14.0439 10.0951 14.0916C10.1637 14.1393 10.216 14.2068 10.2451 14.2851L10.8349 15.9083L12.4565 16.4962C12.5355 16.5243 12.6038 16.5763 12.652 16.6451C12.7001 16.7138 12.7256 16.7958 12.7249 16.8797Z" fill="#F5BC00"/>
-    <path d="M23 10.8564C23.0006 10.9402 22.9752 11.022 22.9272 11.0906C22.8791 11.1592 22.8109 11.2112 22.732 11.2392L21.1129 11.8279L20.5243 13.4466C20.4953 13.5248 20.4431 13.5922 20.3747 13.6397C20.3062 13.6873 20.2249 13.7128 20.1415 13.7128C20.0582 13.7128 19.9768 13.6873 19.9084 13.6397C19.8399 13.5922 19.7877 13.5248 19.7587 13.4466L19.1699 11.8262L17.551 11.2392C17.4729 11.2102 17.4055 11.158 17.3579 11.0896C17.3103 11.0211 17.2848 10.9398 17.2848 10.8564C17.2848 10.7731 17.3103 10.6917 17.3579 10.6233C17.4055 10.5549 17.4729 10.5026 17.551 10.4736L19.1717 9.8849L19.7587 8.26622C19.7877 8.18808 19.8399 8.12069 19.9084 8.0731C19.9768 8.02551 20.0582 8 20.1415 8C20.2249 8 20.3062 8.02551 20.3747 8.0731C20.4431 8.12069 20.4953 8.18808 20.5243 8.26622L21.1131 9.88669L22.732 10.4736C22.8109 10.5017 22.8791 10.5536 22.9272 10.6222C22.9752 10.6908 23.0006 10.7727 23 10.8564Z" fill="#F5BC00"/>
-    <path d="M16.0293 21.1648C16.0297 21.2199 16.013 21.2738 15.9814 21.319C15.9497 21.3641 15.9048 21.3983 15.8529 21.4168L14.7868 21.8044L14.3994 22.8702C14.3803 22.9216 14.3459 22.966 14.3008 22.9973C14.2558 23.0286 14.2022 23.0454 14.1473 23.0454C14.0924 23.0454 14.0388 23.0286 13.9938 22.9973C13.9487 22.966 13.9143 22.9216 13.8952 22.8702L13.5076 21.8032L12.4417 21.4168C12.3903 21.3977 12.3459 21.3633 12.3146 21.3183C12.2832 21.2732 12.2664 21.2196 12.2664 21.1648C12.2664 21.1099 12.2832 21.0563 12.3146 21.0113C12.3459 20.9662 12.3903 20.9318 12.4417 20.9127L13.5088 20.5251L13.8952 19.4594C13.9143 19.4079 13.9487 19.3636 13.9938 19.3322C14.0388 19.3009 14.0924 19.2841 14.1473 19.2841C14.2022 19.2841 14.2558 19.3009 14.3008 19.3322C14.3459 19.3636 14.3803 19.4079 14.3994 19.4594L14.787 20.5263L15.8529 20.9127C15.9048 20.9312 15.9497 20.9654 15.9814 21.0106C16.013 21.0557 16.0297 21.1096 16.0293 21.1648Z" fill="#F5BC00"/>
-    <path d="M13.7725 15.2277L16.7746 13.0212L22.3973 20.6693C22.8895 21.3388 22.7457 22.2805 22.0761 22.7727L21.4988 23.197C20.8292 23.6891 19.8874 23.5453 19.3952 22.8758L13.7725 15.2277Z" fill="#6A7888"/>
-    <path d="M16.0746 12.0553L13.1877 14.2569L11.1118 11.5355C10.6078 10.8748 10.7349 9.93071 11.3957 9.4268L11.8898 9.05C12.5505 8.5461 13.4947 8.6732 13.9987 9.3339L16.0746 12.0553Z" fill="#F5BC00"/>
-</svg>
\ No newline at end of file
diff --git a/resources/js/components/templates/TemplateAssetsView.vue b/resources/js/components/templates/TemplateAssetsView.vue
index 57e0e65958..e1ffd106b2 100644
--- a/resources/js/components/templates/TemplateAssetsView.vue
+++ b/resources/js/components/templates/TemplateAssetsView.vue
@@ -88,11 +88,6 @@ export default {
       type: [String, null],
       default: null,
     },
-    wizardTemplateUuid: {
-      type: String,
-      required: false,
-      default: null,
-    },
   },
   data() {
     return {
@@ -126,9 +121,6 @@ export default {
       formData.append("id", this.responseId);
       formData.append("request", JSON.stringify(this.request));
       formData.append("existingAssets", JSON.stringify(this.updatedAssets));
-      if (this.wizardTemplateUuid !== null) {
-        formData.append("wizardTemplateUuid", this.wizardTemplateUuid);
-      }
       ProcessMaker.apiClient.post(`/template/create/${this.assetType}/${this.responseId}`, formData)
         .then((response) => {
           this.$nextTick(() => {
diff --git a/resources/js/components/templates/TemplateSearch.vue b/resources/js/components/templates/TemplateSearch.vue
index e95a365484..ef8a820890 100644
--- a/resources/js/components/templates/TemplateSearch.vue
+++ b/resources/js/components/templates/TemplateSearch.vue
@@ -19,7 +19,7 @@
         </b-input-group-append>
       </b-input-group>
     </div>
-    <div class="cards-container" :class="type !== 'wizard' ? 'fixed-height' : '' ">
+    <div class="cards-container fixed-height">
       <b-card-group v-if="showTemplateOptionsActionBar && component === 'template-select-card' " id="template-options" deck class="d-flex small-deck-margin">
         <button-card
           class="col-4 p-0"
@@ -51,7 +51,7 @@
       </b-card-group>
 
       <div class="pb-2 template-container">
-        <template v-if="noResults && type !== 'wizard'">
+        <template v-if="noResults">
           <div class="no-data-icon d-flex d-block justify-content-center pb-2">
             <i class="fas fa-umbrella-beach mt-5" />
           </div>
@@ -59,23 +59,8 @@
             {{ $t('No Data Available') }}
           </div>
         </template>
-        <template v-else-if="noResults && type == 'wizard'">
-          <div class="d-flex justify-content-center my-5">
-            <img
-              class="image d-flex"
-              src="/img/processes-catalogue-empty.svg"
-              alt="recent projects"
-            >
-          </div>
-          <h4 class="text-center">
-            {{ $t("Currently, there are no Guided Templates available.") }}
-          </h4>
-          <p class="text-center">
-            {{ $t('Please check back soon.') }}
-          </p>
-        </template>
         <template v-else>
-          <b-card-group id="template-options" deck class="small-deck-margin template-options" :class="type !== 'wizard' ?  'd-flex' : ''">
+          <b-card-group id="template-options" deck class="small-deck-margin template-options d-flex">
             <template-select-card
               v-show="component === 'template-select-card'"
               v-for="(template, index) in templates"
@@ -87,7 +72,6 @@
           </b-card-group>
         </template>
         <template-details v-if="component === 'template-details'" :template="template"></template-details>
-        <wizard-template-details v-if="showWizardTemplateDetails" ref="wizardTemplateDetails" :template="template"></wizard-template-details>
       </div>
     </div>
     <template v-if="component !== 'template-details'">
@@ -124,10 +108,9 @@ import TemplateSelectCard from "./TemplateSelectCard.vue";
 import TemplateDetails from "./TemplateDetails.vue";
 import datatableMixin from "../../components/common/mixins/datatable";
 import dataLoadingMixin from "../../components/common/mixins/apiDataLoading";
-import WizardTemplateDetails from "./WizardTemplateDetails.vue";
 
 export default {
-  components: { ButtonCard, TemplateSelectCard, TemplateDetails, WizardTemplateDetails },
+  components: { ButtonCard, TemplateSelectCard, TemplateDetails },
   mixins: [datatableMixin, dataLoadingMixin],
   props: {
     type: String,
@@ -165,14 +148,8 @@ export default {
         svgIcon: "../../../img/process-intelligence-logo-black.png",
         svgIconStyle: "width: 20%; height: auto; margin-left: auto; margin-right: auto; object-fit: contain;",
       },
-      showWizardTemplateDetails: false,
     };
   },
-  computed: {
-    hasGuidedTemplateParams() {
-      return window.location.search.includes('?categoryId=guided_templates');
-    }
-  },
   watch: {
     currentPage() {
       this.fetch();
@@ -184,12 +161,6 @@ export default {
   methods: {
     async loadData() {
       await this.fetch();
-
-      // After fetch is completed, check if guided template params exist in the URL.
-      // This is used when the URL is directly loaded, and we need to target the specified template to show.
-      if (this.hasGuidedTemplateParams) {
-        this.showDetails();
-      }
     },
     async fetch() {
       this.loading = true;
@@ -201,10 +172,6 @@ export default {
               ? "templates/" + this.type.toLowerCase() +"?"
               : "templates/" + this.type.toLowerCase() + "?status=" + this.status + "&";
 
-      // If the type is 'wizard', override the URL to fetch guided templates
-      if (this.type === 'wizard') {
-        url = 'wizard-templates?';
-      }
       // Load from our api client
       await ProcessMaker.apiClient
         .get(
@@ -249,30 +216,10 @@ export default {
         if (templateId) {
           this.loadTemplateDetails(templateId);
         }
-      } else if ($event && $event.type === "wizard") {  // Handle different scenarios based on $event type 
-        // Add template parameter to the URL if guided templates are selected
-        let url = new URL(window.location.href);
-        if (url.search.includes('?categoryId=guided_templates')) {
-          url.searchParams.append('guided_templates', true);
-          url.searchParams.append('template', $event.template.unique_template_id);
-          history.pushState(null, '', url); // Update the URL without triggering a page reload
-        }
-
-        // Direct selection of a wizard template card
-        this.loadTemplateDetails($event.template.unique_template_id);
       } else {
-        // Direct selection of a default template card
         this.emitTemplateDetails($event.template);
       }
     },
-    loadTemplateDetails(uniqueTemplateId) {
-      this.template = this.templates.find(template => template.unique_template_id === uniqueTemplateId);
-      this.showWizardTemplateDetails = true;
-
-      this.$nextTick(() => {
-        this.$refs.wizardTemplateDetails.show();
-      });
-    },
     emitTemplateDetails(template) {
       this.$emit('show-details', {
         'id': template.id,
diff --git a/resources/js/components/templates/TemplateSelectCard.vue b/resources/js/components/templates/TemplateSelectCard.vue
index 7a6a3182d2..be82c324ac 100644
--- a/resources/js/components/templates/TemplateSelectCard.vue
+++ b/resources/js/components/templates/TemplateSelectCard.vue
@@ -1,13 +1,8 @@
 <template>
-  <div :class="type !== 'wizard' ? 'template-select-card-container pb-2' : 'wizard-select-card-container pb-4'" >
+  <div class="template-select-card-container pb-2">
     <div v-if="!showTemplatePreview">
-      <wizard-template-card
-        v-if="type === 'wizard'"
-        :template="template"
-        @show-details="showDetails()"
-      />
       <screen-template-card
-        v-else-if="type === 'screen'"
+        v-if="type === 'screen'"
         :template="template"
         :is-active="isActive"
         :default-template-id="defaultTemplateId"
@@ -28,13 +23,12 @@
 </template>
 
 <script>
-import WizardTemplateCard from "./WizardTemplateCard.vue";
 import ScreenTemplateCard from "./ScreenTemplateCard.vue";
 import DefaultTemplateCard from "./DefaultTemplateCard.vue";
 import PreviewTemplate from "./PreviewTemplate.vue";
 
 export default {
-  components: { WizardTemplateCard, DefaultTemplateCard, ScreenTemplateCard, PreviewTemplate },
+  components: { DefaultTemplateCard, ScreenTemplateCard, PreviewTemplate },
   props: ["template", "type", "isActive", "defaultTemplateId", "defaultTemplateScreenType", "isDefaultTemplatePublic"],
   data() {
     return {
@@ -65,10 +59,4 @@ export default {
   flex: 0 0 33.333333%;
 }
 
-.wizard-select-card-container {
-  height: 240px;
-  margin-right: 1rem;
-  margin-top: 1rem;
-  width: 350px;
-}
 </style>
diff --git a/resources/js/components/templates/WizardHelperProcessModal.vue b/resources/js/components/templates/WizardHelperProcessModal.vue
deleted file mode 100644
index 5e141ccccd..0000000000
--- a/resources/js/components/templates/WizardHelperProcessModal.vue
+++ /dev/null
@@ -1,67 +0,0 @@
-<template>
-  <div>
-      <modal
-          id="processWizard"
-          class="wizard-template-modal"
-          size="huge"
-          :hide-footer="true"
-          @close="close"
-      >
-          <task
-              v-if="showHelperProcess"
-              ref="task"
-              class="card border-0"
-              v-model="formData"
-              :initial-task-id="task.id"
-              :initial-request-id="task.process_request_id"
-              :user-id="currentUserId"
-              @task-updated="taskUpdated"
-              @submit="submit"
-              @completed="completed"
-          ></task>
-      </modal>
-  </div>
-</template>
-
-<script>
-import Modal from "../../components/shared/Modal.vue";
-import {Task} from "@processmaker/screen-builder";
-import wizardHelperProcessModalMixin from "./mixins/wizardHelperProcessModal";
-
-export default {
-  mixins: [wizardHelperProcessModalMixin],
-  components: { Modal, Task},
-  props: ["wizardTemplateUuid", "processLaunchpadId"],
-  data() {
-      return {
-          helperProcessId: null,
-          startEvents: null,
-          shouldImportProcessTemplate: false,
-          showHelperProcess: false,
-      }
-  }
-}
-</script>
-
-<style scoped>
-.wizard-details-text {
-font-weight: 400;
-}
-.wizard-details-description {
-font-size: 20px;
-}
-
-.wizard-details-headline {
-font-size: 26px;
-}
-
-.wizard-details-button{
-border-radius: 11px;
-border: none;
-background-color: #1572C2;
-color: #FFFFFF;
-display: inline-flex;
-padding: 7px 16px;
-align-items: center;
-}
-</style>
\ No newline at end of file
diff --git a/resources/js/components/templates/WizardTemplateCard.vue b/resources/js/components/templates/WizardTemplateCard.vue
deleted file mode 100644
index 06f3737ba3..0000000000
--- a/resources/js/components/templates/WizardTemplateCard.vue
+++ /dev/null
@@ -1,86 +0,0 @@
-<template>
-  <div>
-    <b-card 
-      no-body 
-      class="wizard-template-select-card p-0"
-      :style="{ backgroundImage: 'url(' + cardBackgroundImage + ')' }"
-      @click="showDetails()"
-      @mouseenter="addHoverClass"
-      @mouseleave="removeHoverClass"
-    >
-      <b-card-body class="p-2">
-        <div class="wizard-icon-container text-right mb-3">
-          <img src="../../../img/wizard-template-icon.svg" alt="Guided Template Icon">
-        </div>
-        <b-card-text class="mx-4">
-          <img :src="templateIcon" :alt="template.name + ' icon'" width="45px" class="mb-3"/>
-          <h5 class="text-uppercase">{{ template.name | str_limit(30) }}</h5>
-          {{ template.description | str_limit(150) }}
-        </b-card-text>
-      </b-card-body>
-    </b-card>
-  </div>
-</template>
-
-<script>
-import templateMixin from './mixins/template.js';
-
-export default {
-  components: { },
-  mixins: [templateMixin],
-  props: ["template"],
-  computed: {
-    cardBackgroundImage() {
-      return this.template?.template_media?.cardBackground;
-    },
-    templateIcon() {
-      return this.template?.template_media?.icon;
-    }
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-.wizard-template-select-card {
-  border-radius: 16px;
-  border: 1px solid #CDDDEE;
-  background-size: cover;
-  width: 350px;
-  height: 240px;
-  overflow: hidden;
-  &:before {
-    content: "";
-    background-color: #ffff;
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    opacity: .5;
-  }
-  &.hover {
-    box-shadow: 0px 10px 20px 4px #00000021;
-    cursor: pointer;
-  }
-
-  .card-body {
-    z-index: 2;
-    .card-text {
-      font-size: 15px;
-      color: #556271;
-      h5 {
-          font-weight: 700;
-      }
-    }
-  }
-  
-}
-
-@media (min-width: 576px) {
-  .card-deck .card {
-    margin-left: 9px;
-    margin-right: 9px;
-  }
-}
-
-</style>
\ No newline at end of file
diff --git a/resources/js/components/templates/WizardTemplateDetails.vue b/resources/js/components/templates/WizardTemplateDetails.vue
deleted file mode 100644
index 28d39a1971..0000000000
--- a/resources/js/components/templates/WizardTemplateDetails.vue
+++ /dev/null
@@ -1,162 +0,0 @@
-<template>
-  <div>
-    <modal
-      id="wizardTemplateDetails"
-      :content-class="!showHelperProcess ? 'first_slide' : ''"
-      size="huge"
-      :hide-footer="true"
-      @close="close"
-    >
-      <b-row v-if="!showHelperProcess" align-v="center">
-        <b-col class="wizard-template-carousel col-5">
-          <b-carousel fade :interval="slideInterval">
-            <b-carousel-slide v-for="(image, index) in templateSlides" :key="index" :img-src="image"/>
-          </b-carousel>
-        </b-col>
-        <b-col>
-          <div class="wizard-details-container text-left mb-3">
-            <div class="wizard-details-text pl-3">
-              <h1 class="mb-3 d-inline-block font-weight-bold template-name">{{ templateDetails['modal-title']| str_limit(30) }}</h1>
-              <h3 class="wizard-details-headline text-white">{{ templateDetails['modal-excerpt'] | str_limit(150) }}</h3>
-              <div v-for="item in templateModalDescriptionItems" class="mb-3 wizard-details-description text-white d-flex align-items-center">
-                <span v-if="templateListIcon" class="mr-3">
-                  <img
-                    :src="templateListIcon"
-                    :alt="template.name + ' icon'"
-                    width="30px"
-                  >
-                </span>
-                <span class="template-list-item">{{ item | str_limit(150) }}</span>
-              </div>
-              <hr class="template-divider mx-2"/>
-              <button class="wizard-details-button text-uppercase"  @click.prevent="getHelperProcessStartEvent('wizard-details-modal')">
-                <i class="fas fa-play-circle mr-1" />
-                {{ $t('Get Started') }}
-              </button>
-            </div>
-          </div>
-        </b-col>
-      </b-row>
-      <task
-          v-if="showHelperProcess"
-          ref="task"
-          class="card border-0"
-          v-model="formData"
-          :initial-task-id="task.id"
-          :initial-request-id="task.process_request_id"
-          :user-id="currentUserId"
-          @task-updated="taskUpdated"
-          @submit="submit"
-          @completed="completed"
-      ></task>
-    </modal>
-  </div>
-</template>
-
-<script>
-import Modal from "../shared/Modal.vue";
-import {Task} from "@processmaker/screen-builder";
-import wizardHelperProcessModalMixin from "./mixins/wizardHelperProcessModal";
-
-export default {
-  components: { Modal, Task },
-  mixins: [wizardHelperProcessModalMixin],
-  props: ["template"],
-  data() {
-    return {
-      showHelperProcess: false,
-      src: "",
-      formData: {},
-      task: {},
-      currentUserId: null,
-      helperProcessId: null,
-      startEvents: null,
-      shouldImportProcessTemplate: true,
-    };
-  },
-  computed: {
-    templateDetails() {
-      return JSON.parse(this.template?.template_details);
-    },
-    templateListIcon() {
-      return this.template?.template_media?.listIcon;
-    },
-    templateSlides() {
-      return this.template?.template_media?.slides;
-    },
-    templateModalDescriptionItems() {
-      return this.templateDetails['modal-description'].split(';');
-    },
-    slideInterval() {
-      return Object.keys(this.template?.template_media?.slides).length > 1 ? 3000 : 0;
-    }
-  },
-  methods: {
-    show() {
-      this.$bvModal.show("wizardTemplateDetails");
-    },
-    close() {
-      this.$bvModal.hide("wizardTemplateDetails");
-      
-      // Remove template parameter from the URL
-      let url = new URL(window.location.href);
-      if (url.search.includes('?categoryId=guided_templates')) {
-        url.searchParams.delete('template');
-        url.searchParams.delete('guided_templates');
-        history.pushState(null, '', url); // Update the URL without triggering a page reload
-      }
-      
-      // Cancels the associated process request to prevent orphaned processes.
-      if (this.showHelperProcess) {
-        this.cancelHelperProcessRequest();
-      }
-    },
-  },
-};
-</script>
-
-<style scoped>
-.wizard-details-text {
-  font-weight: 400;
-}
-.wizard-details-description {
-  font-size: 18px;
-  line-height: 3px;
-  font-weight: lighter;
-}
-
-.wizard-details-description .template-list-item{
-  line-height:1.5rem;
-}
-
-.wizard-details-headline {
-  font-size: 20px;
-  margin-bottom: 22px;
-  font-weight:lighter;
-}
-
-.wizard-details-button {
-  border-radius: 11px;
-  border: none!important;
-  background-color: #1572C2;
-  color: #FFFFFF;
-  display: inline-flex;
-  padding: 7px 16px;
-  align-items: center;
-}
-
-.wizard-details-button:focus {
-  border:none;
-  outline: none;
-}
-
-.template-divider {
-  background-color: #0081D8;
-  margin-top: 2rem;
-  margin-bottom: 2rem;
-}
-
-::v-deep(.custom-css-scope [selector="btn-bx1"] button) {
-  width: auto !important;
-}
-</style>
\ No newline at end of file
diff --git a/resources/js/components/templates/mixins/wizardHelperProcessModal.js b/resources/js/components/templates/mixins/wizardHelperProcessModal.js
deleted file mode 100644
index a7be3a36a7..0000000000
--- a/resources/js/components/templates/mixins/wizardHelperProcessModal.js
+++ /dev/null
@@ -1,144 +0,0 @@
-export default {
-  data() {
-    return {
-      task: null,
-      currentUserId: null,
-      formData: {},
-      importingProcessTemplate: false,
-    };
-  },
-  methods: {
-    getHelperProcessStartEvent(triggeredBy = null) {
-      if (triggeredBy === "wizard-details-modal") {
-        this.startEvents = this.template.process.start_events
-          .filter((event) => !event.eventDefinitions || event.eventDefinitions.length === 0);
-        this.helperProcessId = this.template.process.id;
-
-        this.triggerHelperProcessStartEvent();
-      } else if (this.wizardTemplateUuid !== null) {
-        ProcessMaker.apiClient.get(`wizard-templates/${this.wizardTemplateUuid}/get-helper-process`)
-          .then((response) => {
-            if (response.data) {
-              this.helperProcessId = response.data.helper_process_id;
-              this.startEvents = JSON.parse(response.data.start_events)
-                .filter((event) => !event.eventDefinitions || event.eventDefinitions.length === 0);
-
-              this.triggerHelperProcessStartEvent();
-            }
-          });
-      }
-    },
-    triggerHelperProcessStartEvent() {
-      const startEventId = this.startEvents[0].id;
-      const url = `/process_events/${this.helperProcessId}?event=${startEventId}`;
-      // Start the helper process
-      window.ProcessMaker.apiClient.post(url, {
-        process_launchpad_id: this.processLaunchpadId ? this.processLaunchpadId : null
-      }).then((response) => {
-        const processRequestId = response.data.id;
-        this.getFirstTask(processRequestId);
-      }).catch((error) => {
-        ProcessMaker.alert(error.message, "danger");
-      });
-    },
-    getFirstTask(processRequestId) {
-      ProcessMaker.apiClient.get("tasks", {
-        params: {
-          page: 1,
-          include: "user,assignableUsers",
-          process_request_id: processRequestId,
-          status: "ACTIVE",
-          per_page: 10,
-          order_by: "due_at",
-          order_direction: "asc",
-        },
-      }).then((response) => {
-        const [firstTask] = response.data.data;
-        if (firstTask) {
-          this.task = firstTask;
-          this.currentUserId = parseInt(document.head.querySelector("meta[name=\"user-id\"]").content, 10);
-          this.$bvModal.show("processWizard");
-          this.showHelperProcess = true;
-        } else {
-          // No task found close modal
-          this.showHelperProcess = false;
-          this.close();
-        }
-      }).catch((error) => {
-        ProcessMaker.alert(error.message, "danger");
-      });
-    },
-    close() {
-      this.$bvModal.hide("processWizard");
-      // Cancels the associated process request to prevent orphaned processes.
-      this.cancelHelperProcessRequest();
-    },
-    cancelHelperProcessRequest() {
-      const processRequestId = this.task.process_request.id;
-      ProcessMaker.apiClient.put(`requests/${processRequestId}`, {
-        status: "CANCELED",
-      }).then(() => {
-        this.showHelperProcess = false;
-      }).catch((error) => {
-        ProcessMaker.alert(error.message, "danger");
-      });
-    },
-    taskUpdated(task) {
-      this.task = task;
-    },
-    completed() {
-      if (!this.importingProcessTemplate && this.shouldImportProcessTemplate) {
-        this.importProcessTemplate();
-      } else if (!this.importingProcessTemplate && !this.shouldImportProcessTemplate) {
-        this.showHelperProcess = false;
-        this.$bvModal.hide("processWizard");
-      }
-    },
-    submit(task) {
-      const { id: taskId } = task;
-      ProcessMaker.apiClient.put(`tasks/${taskId}`, {
-        status: "COMPLETED",
-        data: this.formData,
-      }).catch((error) => {
-        ProcessMaker.alert(error.message, "danger");
-      });
-    },
-    importProcessTemplate() {
-      this.importingProcessTemplate = true;
-      ProcessMaker.apiClient.post(`template/create/process/${this.template.process_template_id}`, {
-        name: this.template.name,
-        description: this.template.description,
-        version: "1.0.0", // TODO: Wizards should have a versions property
-        process_category_id: this.template.process.process_category_id,
-        projects: null,
-        wizardTemplateUuid: this.template.uuid,
-        helperProcessRequestId: this.task.process_request_id,
-      }).then((response) => {
-        this.importingProcessTemplate = false;
-        if (response.data?.existingAssets) {
-          this.handleExistingAssets(response.data);
-        } else {
-          // redirect to the new process launchpad
-          window.location = `/process-browser/${response.data.processId}`;
-        }
-      }).catch((error) => {
-        ProcessMaker.alert(error.message, "danger");
-      });
-    },
-    handleExistingAssets(data) {
-      // Use local storage to pass the data to the assets page.
-      const stateData = {
-        assets: JSON.stringify(data.existingAssets),
-        name: this.template.name,
-        responseId: data.id,
-        request: JSON.stringify(data.request),
-        redirectTo: "process-launchpad",
-        wizardTemplateUuid: this.template.uuid,
-      };
-      localStorage.setItem("templateAssetsState", JSON.stringify(stateData));
-
-      // Redirect to the assets page.
-      window.location = "/template/assets";
-    },
-  },
-};
diff --git a/resources/js/processes-catalogue/components/CatalogueEmpty.vue b/resources/js/processes-catalogue/components/CatalogueEmpty.vue
index 6e5a5994a3..5555e7b4ae 100644
--- a/resources/js/processes-catalogue/components/CatalogueEmpty.vue
+++ b/resources/js/processes-catalogue/components/CatalogueEmpty.vue
@@ -21,7 +21,7 @@
         <button
           type="button"
           class="btn btn-primary text-capitalize"
-          @click="wizardLinkSelected"
+          @click="showTemplates"
         >
           {{ $t("Show Me The Templates") }}
         </button>
@@ -39,16 +39,13 @@ export default {
   components: { EmptySearch },
   props: ["showEmpty", "isBookmarkEmpty"],
   methods: {
-    /**
-     * go to wizard templates section
-     */
-    wizardLinkSelected() {
+    showTemplates() {
       window.ProcessMaker.EventBus.$emit(
-        "wizard-templates-selected",
+        "all-templates-selected",
         {
-          label: this.$t("Guided Templates"),
+          label: this.$t("All Templates"),
           selected: false,
-          id: "guided_templates",
+          id: "all_templates",
         },
       );
     },
diff --git a/resources/js/processes-catalogue/components/ProcessCollapseInfo.vue b/resources/js/processes-catalogue/components/ProcessCollapseInfo.vue
index 2b076d345a..fc491ef35c 100644
--- a/resources/js/processes-catalogue/components/ProcessCollapseInfo.vue
+++ b/resources/js/processes-catalogue/components/ProcessCollapseInfo.vue
@@ -154,15 +154,9 @@ export default {
     };
   },
   computed: {
-    createdFromWizardTemplate() {
-      return !!this.process?.properties?.wizardTemplateUuid;
-    },
     isArchived() {
       return this.process?.status === "ARCHIVED";
     },
-    wizardTemplateUuid() {
-      return this.process?.properties?.wizardTemplateUuid;
-    },
   },
   mounted() {
     this.verifyDescription();
@@ -200,9 +194,6 @@ export default {
     activateReadMore() {
       this.readActivated = true;
     },
-    getHelperProcess() {
-      this.$refs.wizardHelperProcessModal.getHelperProcessStartEvent();
-    },
     toggleInfo() {
       this.showProcessInfo = !this.showProcessInfo;
       this.$emit("toggle-info");
@@ -261,26 +252,10 @@ export default {
 .custom-class {
  margin-top: -13px;
 }
-.wizard-link {
-  text-transform: none;
-}
-.wizard-container {
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-}
-.wizard {
-  display: flex;
-  justify-items: end;
-  width: 294px;
-}
 @media (width < 1200px) {
   .process-options {
     margin-top: 32px;
   }
-  .wizard {
-    width: 170px;
-  }
 }
 @media (1460px <= width < 1600px) {
   .col-pm-9 {
diff --git a/resources/js/processes-catalogue/components/ProcessHeader.vue b/resources/js/processes-catalogue/components/ProcessHeader.vue
deleted file mode 100644
index 89745b9a85..0000000000
--- a/resources/js/processes-catalogue/components/ProcessHeader.vue
+++ /dev/null
@@ -1,275 +0,0 @@
-<template>
-  <div>
-    <div class="header-mobile">
-      <div class="title">
-        {{ process.name }}
-      </div>
-      <div class="start-button">
-        <buttons-start
-          :process="process"
-          :title="$t('Start')"
-          :startEvent="singleStartEvent"
-          :processEvents="processEvents"
-        />
-      </div>
-    </div>
-    <div
-      class="header card-body card-process-info clickable"
-      :style="{
-        borderRadius: infoCollapsed ? '8px 8px 0px 0px' : '8px',
-        borderTopLeftRadius: '8px',
-        borderTopRightRadius: '8px',
-      }"
-      data-toggle="collapse"
-      data-target="#collapseProcessInfo"
-      aria-controls="collapseProcessInfo"
-      :aria-expanded="infoCollapsed"
-      @click="toggleInfoCollapsed()"
-    >
-      <div class="d-flex justify-content-between align-items-center">
-        <div class="d-flex align-items-center">
-          <template v-if="infoCollapsed">
-            <i class="fas fa-caret-down pl-2 mr-2 custom-color"></i>
-            <span class="custom-text">
-              {{ $t("Process Info") }}
-            </span>
-          </template>
-          <template v-else>
-            <i class="fas fa-caret-right pl-2 mr-2 custom-color"></i>
-            <span class="custom-text">
-              {{ $t("Process Info") }}
-            </span>
-          </template>
-        </div>
-
-        <div class="d-flex align-items-center custom-align-wizard">
-          <div
-            class="icon-wizard-class"
-            v-if="iconWizardTemplate && infoCollapsed"
-            @click="getHelperProcess"
-          >
-            <img
-              src="../../../img/wizard-icon.svg"
-              :alt="$t('Guided Template Icon')"
-            />
-            <span class="custom-text">
-              {{ $t('Re-run Wizard') }}
-            </span>
-          </div>
-        </div>
-
-        <div
-          v-if="!hideHeaderOptions"
-          class="d-flex align-items-center"
-        >
-          <div class="card-bookmark mx-2">
-            <bookmark :process="process"></bookmark>
-          </div>
-          <span class="ellipsis-border">
-            <ellipsis-menu
-              v-if="showEllipsis"
-              :actions="processLaunchpadActions"
-              :data="process"
-              :divider="false"
-              :lauchpad="true"
-              variant="none"
-              @navigate="ellipsisNavigate"
-              :isDocumenterInstalled="$root.isDocumenterInstalled"
-              :permission="$root.permission"
-            />
-          </span>
-          <buttons-start
-            :process="process"
-            :startEvent="singleStartEvent"
-            :processEvents="processEvents"
-          />
-        </div>
-        <div
-          v-else
-          class="d-flex align-items-center"
-        >
-          <template v-if="!infoCollapsed">
-            <process-counter
-              :process="process"
-              :icon-wizard-template="iconWizardTemplate"
-              :enable-collapse="enableCollapse"
-              @click.native="toggleInfoCollapsed"
-            />
-          </template>
-        </div>
-      </div>
-    </div>
-    <wizard-helper-process-modal
-      v-if="createdFromWizardTemplate"
-      id="wizardHelperProcessModal"
-      ref="wizardHelperProcessModal"
-      :process-launchpad-id="process.id"
-      :wizard-template-uuid="wizardTemplateUuid"
-    />
-  </div>
-</template>
-
-<script>
-import ButtonsStart from "./optionsMenu/ButtonsStart.vue";
-import ProcessesMixin from "./mixins/ProcessesMixin";
-import EllipsisMenu from "../../components/shared/EllipsisMenu.vue";
-import ellipsisMenuMixin from "../../components/shared/ellipsisMenuActions";
-import Bookmark from "./Bookmark.vue";
-import ProcessCounter from "./optionsMenu/ProcessCounter.vue";
-import WizardHelperProcessModal from "../../components/templates/WizardHelperProcessModal.vue";
-
-export default {
-  components: {
-    ButtonsStart,
-    EllipsisMenu,
-    Bookmark,
-    ProcessCounter,
-    WizardHelperProcessModal,
-  },
-  mixins: [ProcessesMixin, ellipsisMenuMixin],
-  props: {
-    process: {
-      type: Object,
-      required: true,
-    },
-    enableCollapse: {
-      type: Boolean,
-      default: true,
-    },
-    hideHeaderOptions: {
-      type: Boolean,
-      default: false,
-    },
-    iconWizardTemplate: {
-      type: Boolean,
-      default: false,
-    },
-  },
-  data() {
-    return {
-      infoCollapsed: true,
-      processEvents: [],
-      singleStartEvent: null,
-    };
-  },
-  mounted() {
-    this.getStartEvents();
-  },
-  computed: {
-    createdFromWizardTemplate() {
-      return !!this.process?.properties?.wizardTemplateUuid;
-    },
-    wizardTemplateUuid() {
-      return this.process?.properties?.wizardTemplateUuid;
-    },
-  },
-  methods: {
-    ellipsisNavigate(action, data) {
-      this.$emit("onProcessNavigate", action, data);
-    },
-    toggleInfoCollapsed() {
-      this.infoCollapsed = !this.infoCollapsed;
-      this.$emit("onProcessInfoCollapsed", this.infoCollapsed);
-    },
-    /**
-     * get start events for dropdown Menu
-     */
-    getStartEvents() {
-      this.processEvents = [];
-      ProcessMaker.apiClient
-        .get(`process_bookmarks/processes/${this.process.id}/start_events`)
-        .then((response) => {
-          this.processEvents = response.data.data;
-          const nonWebEntryStartEvents = this.processEvents.filter(
-            (e) => !("webEntry" in e) || !e.webEntry
-          );
-          if (nonWebEntryStartEvents.length === 1) {
-            this.singleStartEvent = nonWebEntryStartEvents[0].id;
-          }
-        })
-        .catch((err) => {
-          ProcessMaker.alert(err, "danger");
-        });
-    },
-    getHelperProcess() {
-      this.$refs.wizardHelperProcessModal.getHelperProcessStartEvent();
-    },
-  },
-};
-</script>
-
-<style lang="scss" scoped>
-@import url("./scss/processes.css");
-@import "~styles/variables";
-.header {
-  @media (max-width: $lp-breakpoint) {
-    display: none;
-  }
-}
-
-.header-mobile {
-  display: none;
-  padding: 1em;
-
-  .title {
-    flex: 1;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    font-size: 22px;
-    letter-spacing: -0.2;
-    color: #4c545c;
-    font-weight: 400;
-  }
-
-  @media (max-width: $lp-breakpoint) {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-  }
-}
-
-.card-bookmark {
-  float: right;
-  font-size: 20px;
-}
-.card-bookmark:hover {
-  cursor: pointer;
-}
-
-.card-process-info {
-  border-color: #cdddee;
-  border-radius: 8px;
-  background-color: #fff;
-  margin-bottom: 12px;
-  border: 1px solid rgb(205, 221, 238);
-  padding-top: 13px;
-  height: 53px;
-  margin-right: 20px;
-}
-
-.custom-color {
-  color: #4c545c;
-}
-
-.clickable {
-  cursor: pointer;
-}
-
-.custom-align-wizard {
-  margin-left: auto;
-}
-
-.custom-text {
-  font-family: 'Open Sans', sans-serif;
-  font-size: 16px;
-  font-weight: 400;
-  line-height: 24px;
-  letter-spacing: -0.02;
-  color: #556271;
-}
-
-.icon-wizard-class {
-  z-index: 5;
-}
-</style>
diff --git a/resources/js/processes-catalogue/components/ProcessInfo.vue b/resources/js/processes-catalogue/components/ProcessInfo.vue
index 689ed743b2..309d9eec04 100644
--- a/resources/js/processes-catalogue/components/ProcessInfo.vue
+++ b/resources/js/processes-catalogue/components/ProcessInfo.vue
@@ -25,8 +25,6 @@
       :title="title"
       :process="process"
       :full-carousel="fullCarousel"
-      :is-wizard-template="createdFromWizardTemplate"
-      @getHelperProcess="getHelperProcess"
       @closeCarousel="closeFullCarousel"
       @close="closeProcessInfo"
     >
@@ -44,13 +42,6 @@
         </div>
       </div>
     </slide-process-info>
-    <wizard-helper-process-modal
-      v-if="createdFromWizardTemplate"
-      id="wizardHelperProcessModal"
-      ref="wizardHelperProcessModal"
-      :process-launchpad-id="process.id"
-      :wizard-template-uuid="wizardTemplateUuid"
-    />
   </div>
 </template>
 
@@ -60,7 +51,6 @@ import ProcessTab from "./ProcessTab.vue";
 import CarouselSlide from "./CarouselSlide.vue";
 import SlideProcessInfo from "./slideProcessInfo/SlideProcessInfo.vue";
 import ProcessOptions from "./ProcessOptions.vue";
-import WizardHelperProcessModal from "../../components/templates/WizardHelperProcessModal.vue";
 
 export default {
   components: {
@@ -69,7 +59,6 @@ export default {
     SlideProcessInfo,
     ProcessOptions,
     CarouselSlide,
-    WizardHelperProcessModal,
   },
   props: ["process", "currentUserId", "currentUser", "ellipsisPermission"],
   data() {
@@ -94,12 +83,6 @@ export default {
         ? this.process.name
         : this.$t("Process Information");
     },
-    createdFromWizardTemplate() {
-      return !!this.process?.properties?.wizardTemplateUuid;
-    },
-    wizardTemplateUuid() {
-      return this.process?.properties?.wizardTemplateUuid;
-    },
   },
   mounted() {
     this.dataOptions = {
@@ -146,9 +129,6 @@ export default {
     showFullCarousel() {
       this.fullCarousel = true;
     },
-    getHelperProcess() {
-      this.$refs.wizardHelperProcessModal.getHelperProcessStartEvent();
-    },
   },
 };
 </script>
diff --git a/resources/js/processes-catalogue/components/ProcessListing.vue b/resources/js/processes-catalogue/components/ProcessListing.vue
index 8a303c2a3a..13aa31218e 100644
--- a/resources/js/processes-catalogue/components/ProcessListing.vue
+++ b/resources/js/processes-catalogue/components/ProcessListing.vue
@@ -2,25 +2,16 @@
   <div class="process-listing h-100">
     <CardProcess
       :key="index"
-      v-if="!isTemplateCategory"
       :categoryId="categoryId"
     />
-
-    <wizard-templates
-        v-if="isTemplateCategory"
-        :categoryId="categoryId"
-    />
-
   </div>
 </template>
 
 <script>
 import CardProcess from "./CardProcess.vue";
-import WizardTemplates from "./WizardTemplates.vue";
 export default {
   props: ["categoryId"],
   components: {
-    WizardTemplates,
     CardProcess,
   },
   data(){
@@ -33,11 +24,6 @@ export default {
       }
     }
   },
-  computed: {
-    isTemplateCategory() {
-      return ['guided_templates'].includes(this.categoryId)
-    },
-  },
 };
 </script>
 
diff --git a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
index 95f7115307..1f9d1dac7d 100644
--- a/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
+++ b/resources/js/processes-catalogue/components/ProcessesCatalogue.vue
@@ -5,7 +5,6 @@
       ref="breadcrumb"
       :category="category ? category.name : ''"
       :process="selectedProcess ? selectedProcess.name : ''"
-      :template="guidedTemplates ? 'Guided Templates' : ''"
     />
     <div class="tw-flex tw-h-full tw-relative">
       <component :is="isMobile ? 'mobile-drawer' : 'collapsable-container'"
@@ -103,14 +102,11 @@ export default {
         },
       ],
       fields: [],
-      wizardTemplates: [],
-      showWizardTemplates: false,
       showCardProcesses: false,
       showProcess: false,
       showProcessScreen: false,
       category: null,
       selectedProcess: null,
-      guidedTemplates: false,
       numCategories: 100,
       page: 1,
       key: 0,
@@ -292,7 +288,6 @@ export default {
      */
     openProcess(process) {
       this.showCardProcesses = false;
-      this.guidedTemplates = false;
       this.selectedProcess = process;
     },
     /**
@@ -302,12 +297,6 @@ export default {
       const categoryId = this.category ? this.category.id : "recent";
       this.$router.push({ name: "index", query: { categoryId } });
     },
-    hasGuidedTemplateParamsOnly(url) {
-      return (
-        url.search.includes("?guided_templates=true")
-        && !url.search.includes("?guided_templates=true&template=")
-      );
-    },
     hasTemplateParams(url) {
       return url.search.includes("&template=");
     },
diff --git a/resources/js/processes-catalogue/components/WizardTemplates.vue b/resources/js/processes-catalogue/components/WizardTemplates.vue
deleted file mode 100644
index e2ca5e9a74..0000000000
--- a/resources/js/processes-catalogue/components/WizardTemplates.vue
+++ /dev/null
@@ -1,42 +0,0 @@
-<template>
-  <div class="wizard-template-container">
-    <template-search
-      id="wizard-search"
-      type="wizard"
-      package-ai="false"
-      :component="currentComponent"
-      :show-template-options-action-bar="false"
-      :fetch-on-created="false"
-      @show-details="showDetails($event)"
-    />
-  </div>
-</template>
-
-<script>
-import TemplateSearch from "../../components/templates/TemplateSearch.vue";
-
-export default {
-  components: { TemplateSearch },
-  props: ["categoryId"],
-  data() {
-    return {
-      currentComponent: "template-select-card",
-      templateData: {},
-    };
-  },
-  methods: {
-    showDetails($event) {
-      this.templateData = $event;
-      this.currentComponent = "template-details";
-    },
-  },
-};
-</script>
-
-<style>
-#wizard-search  #search-box,
-#wizard-search .input-group-prepend .btn-search-run {
-  border: none;
-  background-color: #f7f9fb;
-}
-</style>
diff --git a/resources/js/processes-catalogue/components/menuCatologue.vue b/resources/js/processes-catalogue/components/menuCatologue.vue
index e043959878..448ad4c5a4 100644
--- a/resources/js/processes-catalogue/components/menuCatologue.vue
+++ b/resources/js/processes-catalogue/components/menuCatologue.vue
@@ -64,7 +64,7 @@
         </div>
         <i
           class="fas fa-sort-down"
-          :class="{'fa-sort-up': showGuidedTemplates, 'fa-sort-down': !showGuidedTemplates,}"
+          :class="{'fa-sort-up': showTemplates, 'fa-sort-down': !showTemplates,}"
         />
       </div>
     </div>
@@ -124,7 +124,7 @@ export default {
       modalProcess: true,
       countCategories: 0,
       showCatalogue: false,
-      showGuidedTemplates: false,
+      showTemplates: false,
       selectedProcessItem: null,
       selectedTemplateItem: null,
       templateOptions: [
@@ -133,11 +133,6 @@ export default {
           selected: false,
           id: "all_templates",
         },
-        {
-          label: this.$t("Guided Templates"),
-          selected: false,
-          id: "guided_templates",
-        },
       ],
       comeFromProcess: false,
     };
@@ -147,7 +142,7 @@ export default {
       this.openTemplate(obj);
     });
 
-    window.ProcessMaker.EventBus.$on("wizard-templates-selected", (obj) => {
+    window.ProcessMaker.EventBus.$on("all-templates-selected", (obj) => {
       this.selectTemplateItem(obj);
     });
   },
@@ -235,7 +230,7 @@ export default {
     selectTemplateItem(item = null) {
       if (item === null) {
         item = this.templateOptions.find((obj) => {
-          return obj.id === "guided_templates";
+          return obj.id === "all_templates";
         });
       }
       this.selectedTemplateItem = item;
@@ -269,7 +264,7 @@ export default {
       this.showCatalogue = !this.showCatalogue;
     },
     onToggleTemplates() {
-      this.showGuidedTemplates = !this.showGuidedTemplates;
+      this.showTemplates = !this.showTemplates;
     },
     /**
      * Filter categories
diff --git a/resources/js/processes-catalogue/components/optionsMenu/ProcessCounter.vue b/resources/js/processes-catalogue/components/optionsMenu/ProcessCounter.vue
index 449e2b674b..41fd12db39 100644
--- a/resources/js/processes-catalogue/components/optionsMenu/ProcessCounter.vue
+++ b/resources/js/processes-catalogue/components/optionsMenu/ProcessCounter.vue
@@ -150,8 +150,4 @@ export default {
   margin-top: 10px;
   padding-left: 15px;
 }
-.icon-wizard-class {
-  border-left: 1px solid rgba(0, 0, 0, 0.125);
-  z-index: 5;
-}
 </style>
diff --git a/resources/js/processes-catalogue/components/slideProcessInfo/SlideProcessInfo.vue b/resources/js/processes-catalogue/components/slideProcessInfo/SlideProcessInfo.vue
index 681a3eb123..624f9a1068 100644
--- a/resources/js/processes-catalogue/components/slideProcessInfo/SlideProcessInfo.vue
+++ b/resources/js/processes-catalogue/components/slideProcessInfo/SlideProcessInfo.vue
@@ -20,21 +20,6 @@
             {{ title }}
           </h3>
           <div class="tw-flex tw-gap-4">
-            <div
-              v-if="isWizardTemplate"
-              class="tw-flex"
-            >
-              <div
-                class="tw-m-0 tw-text-lg tw-font-medium tw-text-gray-700 hover:tw-cursor-pointer"
-                @click="getHelperProcess"
-              >
-                <img
-                  src="../../../../img/wizard-icon.svg"
-                  :alt="$t('Guided Template Icon')"
-                >
-                <span> {{ $t('Re-run Wizard') }} </span>
-              </div>
-            </div>
             <button
               class="tw-bg-transparent tw-border-none
                 tw-text-lg tw-text-gray-600 tw-cursor-pointer
@@ -74,10 +59,6 @@ export default {
       type: Object,
       required: true,
     },
-    isWizardTemplate: {
-      type: Boolean,
-      default: false,
-    },
   },
   methods: {
     closeSlide() {
@@ -86,9 +67,6 @@ export default {
     closeFullCarousel() {
       this.$emit("closeCarousel");
     },
-    getHelperProcess() {
-      this.$emit("getHelperProcess");
-    },
   },
 };
 </script>
diff --git a/resources/js/templates/assets.js b/resources/js/templates/assets.js
index 78e963dfd6..e4f6c14751 100644
--- a/resources/js/templates/assets.js
+++ b/resources/js/templates/assets.js
@@ -12,7 +12,6 @@ const app = new Vue({
       responseId: "",
       request: {},
       redirectTo: "",
-      wizardTemplateUuid: null,
     };
   },
   mounted() {
@@ -23,7 +22,6 @@ const app = new Vue({
       this.responseId = stateData.responseId;
       this.request = JSON.parse(stateData.request);
       this.redirectTo = stateData.redirectTo;
-      this.wizardTemplateUuid = stateData.wizardTemplateUuid;
     }
 
     window.addEventListener("popstate", () => {
diff --git a/resources/lang/en.json b/resources/lang/en.json
index c80d4cc1b8..257686e0f1 100644
--- a/resources/lang/en.json
+++ b/resources/lang/en.json
@@ -1045,7 +1045,6 @@
   "GroupMembersUpdated": "Group Members Updated",
   "Groups To Import": "Groups To Import",
   "Groups": "Groups",
-  "Guided Templates": "Guided Templates",
   "Half": "Half",
   "Have you tried the new AI Assistant?": "Have you tried the new AI Assistant?",
   "Headers": "Headers",
diff --git a/resources/sass/app.scss b/resources/sass/app.scss
index 1ed11da754..f7fecba2a1 100644
--- a/resources/sass/app.scss
+++ b/resources/sass/app.scss
@@ -981,42 +981,6 @@ nav {
 }
 
 
-//Guided templates modal styling
-#wizardTemplateDetails___BV_modal_content_.first_slide {
-  background: linear-gradient(180deg, #3270BC 0%, #00B5DA 100%), linear-gradient(0deg, rgba(255, 255, 255, 0.2), rgba(255, 255, 255, 0.2));
-  padding-left: 0;
-}
-
-#wizardTemplateDetails___BV_modal_content_.first_slide .wizard-template-carousel {
-  margin-left:-17px;
-}
-
-#wizardTemplateDetails___BV_modal_content_.first_slide .template-name {
-  color: #00345B;
-}
-
-#wizardTemplateDetails___BV_modal_content_,
-#processWizard___BV_modal_content_{
-  border-radius: 8px;
-  background: linear-gradient(180deg, rgba(255, 255, 255, 0.29) 0%, rgba(255, 255, 255, 0.62) 100%), var(--borders, #CDDDEE);
-  padding: 50px;
-  color: #556271;
-  min-height: 450px;
-}
-
-#wizardTemplateDetails___BV_modal_header_,
-#processWizard___BV_modal_header_ {
-  border-bottom: none;
-  padding: 0;
-  margin: 0.5rem;
-}
-
-#wizardTemplateDetails___BV_modal_body_ .card,
-#processWizard___BV_modal_body_ .card {
-  background-color: inherit;
-  border: none;
-}
-
 .title-designer {
   color: var(--Black-for-icons, #57646F);
   font-size: 14px;
diff --git a/resources/views/templates/assets.blade.php b/resources/views/templates/assets.blade.php
index fa79f66b2d..732e42036c 100644
--- a/resources/views/templates/assets.blade.php
+++ b/resources/views/templates/assets.blade.php
@@ -25,7 +25,6 @@
       :response-id="responseId"
       :request="request"
       :redirect-to="redirectTo"
-      :wizard-template-uuid="wizardTemplateUuid"
     />
   </div>
 @endsection
diff --git a/routes/api.php b/routes/api.php
index 9cc716d4d4..a94349b9b8 100644
--- a/routes/api.php
+++ b/routes/api.php
@@ -43,7 +43,6 @@
 use ProcessMaker\Http\Controllers\Api\UserConfigurationController;
 use ProcessMaker\Http\Controllers\Api\UserController;
 use ProcessMaker\Http\Controllers\Api\UserTokenController;
-use ProcessMaker\Http\Controllers\Api\WizardTemplateController;
 use ProcessMaker\Http\Controllers\Auth\TwoFactorAuthController;
 use ProcessMaker\Http\Controllers\TestStatusController;
 
@@ -378,10 +377,6 @@
     Route::post('template/{type}/{id}/apply', [TemplateController::class, 'applyTemplate'])->name('template.applyTemplate')->middleware('template-authorization');
     Route::get('screen-builder/{type}/{id}', [TemplateController::class, 'show'])->name('screenBuilder.template.show')->middleware('template-authorization');
 
-    // Wizard Templates
-    Route::get('wizard-templates', [WizardTemplateController::class, 'index'])->name('wizard-templates.index');
-    Route::get('wizard-templates/{template_uuid}/get-helper-process', [WizardTemplateController::class, 'getHelperProcess'])->name('wizard-templates.getHelperProcess');
-
     // debugging javascript errors
     Route::post('debug', [DebugController::class, 'store'])->name('debug.store')->middleware('throttle');
 
diff --git a/storage/api-docs/api-docs.json b/storage/api-docs/api-docs.json
index 3b01de8d45..832f903c0e 100644
--- a/storage/api-docs/api-docs.json
+++ b/storage/api-docs/api-docs.json
@@ -4069,16 +4069,10 @@
                             "schema": {
                                 "properties": {
                                     "data": {
-                                        "type": "array",
-                                        "items": {
-                                            "type": "object"
-                                        }
+                                        "type": "object"
                                     },
                                     "config": {
-                                        "type": "array",
-                                        "items": {
-                                            "type": "object"
-                                        }
+                                        "type": "object"
                                     },
                                     "code": {
                                         "type": "string"
@@ -4123,16 +4117,10 @@
                             "schema": {
                                 "properties": {
                                     "data": {
-                                        "type": "array",
-                                        "items": {
-                                            "type": "object"
-                                        }
+                                        "type": "object"
                                     },
                                     "config": {
-                                        "type": "array",
-                                        "items": {
-                                            "type": "object"
-                                        }
+                                        "type": "object"
                                     },
                                     "sync": {
                                         "type": "boolean"
@@ -6052,412 +6040,3718 @@
                 },
                 "servers": [
                     {
-                        "url": "http://landlord.test/api/1.1",
+                        "url": "http://localhost/api/1.1",
                         "description": "API v1.1 Server"
                     }
                 ]
             }
-        }
-    },
-    "components": {
-        "schemas": {
-            "DateTime": {
-                "properties": {
-                    "date": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "updateUserGroups": {
-                "properties": {
-                    "groups": {
-                        "type": "array",
-                        "items": {
-                            "type": "integer",
-                            "example": 1
-                        }
-                    }
-                },
-                "type": "object"
-            },
-            "restoreUser": {
-                "properties": {
-                    "username": {
-                        "description": "Username to restore",
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "Variable": {
-                "properties": {
-                    "id": {
-                        "type": "integer",
-                        "example": 1
-                    },
-                    "process_id": {
-                        "type": "integer",
-                        "example": 1
-                    },
-                    "uuid": {
-                        "type": "string",
-                        "format": "uuid",
-                        "example": "550e8400-e29b-41d4-a716-446655440000"
+        },
+        "/collections": {
+            "get": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Returns all collections that the user has access to",
+                "description": "Get a list of Collections.",
+                "operationId": "getCollections",
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/filter"
                     },
-                    "field": {
-                        "type": "string",
-                        "example": "string",
-                        "enum": [
-                            "string",
-                            "number",
-                            "boolean",
-                            "array"
-                        ]
+                    {
+                        "$ref": "#/components/parameters/order_by"
                     },
-                    "label": {
-                        "type": "string",
-                        "example": "Variable 1 for Process 1"
+                    {
+                        "$ref": "#/components/parameters/order_direction"
                     },
-                    "name": {
-                        "type": "string",
-                        "example": "var_1_1"
+                    {
+                        "$ref": "#/components/parameters/per_page"
                     },
-                    "asset": {
-                        "properties": {
-                            "id": {
-                                "type": "string",
-                                "example": "asset_1_1"
-                            },
-                            "type": {
-                                "type": "string",
-                                "example": "sensor",
-                                "enum": [
-                                    "sensor",
-                                    "actuator",
-                                    "controller",
-                                    "device"
-                                ]
-                            },
-                            "name": {
-                                "type": "string",
-                                "example": "Asset 1 for Process 1"
-                            },
-                            "uuid": {
-                                "type": "string",
-                                "format": "uuid",
-                                "example": "550e8400-e29b-41d4-a716-446655440000"
+                    {
+                        "$ref": "#/components/parameters/include"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of collections",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/collections"
+                                            }
+                                        },
+                                        "meta": {
+                                            "$ref": "#/components/schemas/metadata"
+                                        }
+                                    },
+                                    "type": "object"
+                                }
                             }
-                        },
-                        "type": "object"
-                    },
-                    "created_at": {
-                        "type": "string",
-                        "format": "date-time"
-                    },
-                    "updated_at": {
-                        "type": "string",
-                        "format": "date-time"
+                        }
                     }
-                },
-                "type": "object"
+                }
             },
-            "PaginationMeta": {
-                "properties": {
-                    "current_page": {
-                        "type": "integer",
-                        "example": 1
-                    },
-                    "from": {
-                        "type": "integer",
-                        "example": 1
-                    },
-                    "last_page": {
-                        "type": "integer",
-                        "example": 5
-                    },
-                    "path": {
-                        "type": "string",
-                        "example": "http://processmaker.com/processes/variables"
-                    },
-                    "per_page": {
-                        "type": "integer",
-                        "example": 20
-                    },
-                    "to": {
-                        "type": "integer",
-                        "example": 20
-                    },
-                    "total": {
-                        "type": "integer",
-                        "example": 100
-                    },
-                    "links": {
-                        "properties": {
-                            "first": {
-                                "type": "string",
-                                "example": "http://processmaker.com/processes/variables?page=1"
-                            },
-                            "last": {
-                                "type": "string",
-                                "example": "http://processmaker.com/processes/variables?page=5"
-                            },
-                            "prev": {
-                                "type": "string",
-                                "nullable": true
-                            },
-                            "next": {
-                                "type": "string",
-                                "example": "http://processmaker.com/processes/variables?page=2"
+            "post": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Save a new collections",
+                "description": "Create a new Collection.",
+                "operationId": "createCollection",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/collectionsEditable"
                             }
-                        },
-                        "type": "object"
+                        }
                     }
                 },
-                "type": "object"
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/collections"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/collections/{collection_id}": {
+            "get": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Get single collections by ID",
+                "description": "Get a single Collection.",
+                "operationId": "getCollectionById",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of collection to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully found the collections",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/collections"
+                                }
+                            }
+                        }
+                    }
+                }
             },
-            "metadata": {
-                "properties": {
-                    "filter": {
-                        "type": "string"
-                    },
-                    "sort_by": {
-                        "type": "string"
-                    },
+            "put": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Update a collection",
+                "description": "Update a Collection.",
+                "operationId": "updateCollection",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of collection to update",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/collectionsEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "204": {
+                        "description": "success"
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Delete a collection",
+                "description": "Delete a Collection.",
+                "operationId": "deleteCollection",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of collection to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "success"
+                    }
+                }
+            }
+        },
+        "/collections/{collection_id}/export": {
+            "post": {
+                "tags": [
+                    "Screens"
+                ],
+                "summary": "Trigger export collections job",
+                "description": "Export the specified collection.",
+                "operationId": "exportCollection",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of the collection to export",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "202": {
+                        "description": "success"
+                    }
+                }
+            }
+        },
+        "/collections/import": {
+            "post": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Import a new collection",
+                "description": "Import the specified collection.",
+                "operationId": "importCollection",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "multipart/form-data": {
+                            "schema": {
+                                "required": [
+                                    "file"
+                                ],
+                                "properties": {
+                                    "file": {
+                                        "description": "file to upload",
+                                        "type": "file",
+                                        "format": "file"
+                                    }
+                                },
+                                "type": "object"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/collections"
+                                }
+                            }
+                        }
+                    },
+                    "200": {
+                        "description": "success"
+                    }
+                }
+            }
+        },
+        "/collections/{collection_id}/truncate": {
+            "delete": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Deletes all records in a collection",
+                "description": "Truncate a Collection.",
+                "operationId": "truncateCollection",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of collection to truncate",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "success"
+                    }
+                }
+            }
+        },
+        "/collections/{collection_id}/records": {
+            "get": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Returns paginated collection records",
+                "description": "Get the list of records of a collection.",
+                "operationId": "getRecords",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of collection to get records for",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "pmql",
+                        "in": "query",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "per_page",
+                        "in": "query",
+                        "description": "Number of records to return per page. Defaults to 10,000 when omitted, invalid, or non-positive.",
+                        "schema": {
+                            "type": "integer",
+                            "default": 10000
+                        }
+                    },
+                    {
+                        "$ref": "#/components/parameters/filter"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    },
+                    {
+                        "$ref": "#/components/parameters/include"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of records of a collection",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/records"
+                                            }
+                                        },
+                                        "meta": {
+                                            "$ref": "#/components/schemas/metadata"
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Save a new record in a collection",
+                "description": "Create a new record in a Collection.",
+                "operationId": "createRecord",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of the collection",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/recordsEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/records"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/collections/{collection_id}/records/{record_id}": {
+            "get": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Get single record of a collection",
+                "description": "Get a single record of a Collection.",
+                "operationId": "getRecordById",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of the collection",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "record_id",
+                        "in": "path",
+                        "description": "ID of the record to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully found the record",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/records"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Update a record",
+                "description": "Update a record in a Collection.",
+                "operationId": "updateRecord",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of collection",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "record_id",
+                        "in": "path",
+                        "description": "ID of the record ",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/recordsEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "204": {
+                        "description": "success"
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Delete a collection record",
+                "description": "Delete a record of a Collection.",
+                "operationId": "deleteRecord",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of collection",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "record_id",
+                        "in": "path",
+                        "description": "ID of record in collection",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "success"
+                    }
+                }
+            },
+            "patch": {
+                "tags": [
+                    "Collections"
+                ],
+                "summary": "Partial update of a record",
+                "description": "Implements a partial update of a record in a Collection.",
+                "operationId": "patchRecord",
+                "parameters": [
+                    {
+                        "name": "collection_id",
+                        "in": "path",
+                        "description": "ID of collection ",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "record_id",
+                        "in": "path",
+                        "description": "ID of the record ",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/collectionsEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "success"
+                    }
+                }
+            }
+        },
+        "/comments/tasks": {
+            "get": {
+                "tags": [
+                    "Comments"
+                ],
+                "summary": "Returns all the tasks that are active.",
+                "description": "Display a listing of the resource.",
+                "operationId": "getCommentTasks",
+                "parameters": [
+                    {
+                        "name": "process_request_id",
+                        "in": "query",
+                        "description": "Process request id",
+                        "required": false,
+                        "schema": {
+                            "type": "integer"
+                        }
+                    },
+                    {
+                        "$ref": "#/components/parameters/filter"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list all tasks taht are active",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/processRequestToken"
+                                            }
+                                        },
+                                        "meta": {
+                                            "$ref": "#/components/schemas/metadata"
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/data_source_categories": {
+            "get": {
+                "tags": [
+                    "DataSourcesCategories"
+                ],
+                "summary": "Returns all Data Connectors categories that the user has access to",
+                "description": "Display a listing of the Data Connector Categories.",
+                "operationId": "getDataSourceCategories",
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/filter"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    },
+                    {
+                        "$ref": "#/components/parameters/per_page"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of Data Connectors categories",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/DataSourceCategory"
+                                            }
+                                        },
+                                        "meta": {
+                                            "type": "object",
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/components/schemas/metadata"
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "DataSourcesCategories"
+                ],
+                "summary": "Save a new Data Connector Category",
+                "description": "Store a newly created Data Connector Category in storage",
+                "operationId": "createDataSourceCategory",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/dataSourceCategoryEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/DataSourceCategory"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/data_source_categories/{data_source_category_id}": {
+            "get": {
+                "tags": [
+                    "DataSourcesCategories"
+                ],
+                "summary": "Get single Data Connector category by ID",
+                "description": "Display the specified data Source category.",
+                "operationId": "getDatasourceCategoryById",
+                "parameters": [
+                    {
+                        "name": "data_source_category_id",
+                        "in": "path",
+                        "description": "ID of Data Connector category to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully found the Data Connector",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/DataSourceCategory"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "DataSourcesCategories"
+                ],
+                "summary": "Update a Data Connector Category",
+                "description": "Updates the current element",
+                "operationId": "updateDatasourceCategory",
+                "parameters": [
+                    {
+                        "name": "data_source_category_id",
+                        "in": "path",
+                        "description": "ID of Data Connector category to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/dataSourceCategoryEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/DataSourceCategory"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "DataSourcesCategories"
+                ],
+                "summary": "Delete a Data Connector category",
+                "description": "Remove the specified resource from storage.",
+                "operationId": "deleteDataSourceCategory",
+                "parameters": [
+                    {
+                        "name": "data_source_category_id",
+                        "in": "path",
+                        "description": "ID of Data Connector category to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "success"
+                    }
+                }
+            }
+        },
+        "/data_sources": {
+            "get": {
+                "tags": [
+                    "DataSources"
+                ],
+                "summary": "Returns all Data Connectors that the user has access to",
+                "description": "Get the list of records of a Data Connector",
+                "operationId": "getDataSources",
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/filter"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    },
+                    {
+                        "$ref": "#/components/parameters/per_page"
+                    },
+                    {
+                        "$ref": "#/components/parameters/include"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of Data Connectors",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/dataSource"
+                                            }
+                                        },
+                                        "meta": {
+                                            "type": "object",
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/components/schemas/metadata"
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "DataSources"
+                ],
+                "summary": "Save a new Data Connector",
+                "description": "Create a new Data Connector.",
+                "operationId": "createDataSource",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/dataSourceEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/dataSource"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/data_sources/{data_source_id}": {
+            "get": {
+                "tags": [
+                    "DataSources"
+                ],
+                "summary": "Get single Data Connector by ID",
+                "description": "Get a single Data Connector.",
+                "operationId": "getDataSourceById",
+                "parameters": [
+                    {
+                        "name": "data_source_id",
+                        "in": "path",
+                        "description": "ID of Data Connector to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully found the Data Connector",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/dataSource"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "DataSources"
+                ],
+                "summary": "Update a Data Connector",
+                "description": "Update a Data Connector.",
+                "operationId": "updateDataSource",
+                "parameters": [
+                    {
+                        "name": "data_source_id",
+                        "in": "path",
+                        "description": "ID of Data Connector to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/dataSourceEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "204": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/dataSource"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "DataSources"
+                ],
+                "summary": "Delete a Data Connector",
+                "description": "Delete a Data Connector.",
+                "operationId": "deleteDataSource",
+                "parameters": [
+                    {
+                        "name": "data_source_id",
+                        "in": "path",
+                        "description": "ID of Data Connector to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/dataSource"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/data_sources/{data_source_id}/test": {
+            "post": {
+                "tags": [
+                    "DataSources"
+                ],
+                "summary": "Send a Data Connector request",
+                "description": "Send a Data Connector request.",
+                "operationId": "sendDataSource",
+                "parameters": [
+                    {
+                        "name": "data_source_id",
+                        "in": "path",
+                        "description": "ID of Data Connector to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/dataSourceEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "204": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/dataSource"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/requests/{request_id}/data_sources/{data_source_id}": {
+            "post": {
+                "tags": [
+                    "DataSources"
+                ],
+                "summary": "execute Data Source",
+                "description": "Execute a data Source endpoint",
+                "operationId": "executeDataSourceForRequest",
+                "parameters": [
+                    {
+                        "name": "request_id",
+                        "in": "path",
+                        "description": "ID of the request in whose context the datasource will be executed",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "data_source_id",
+                        "in": "path",
+                        "description": "ID of DataSource to be run",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "properties": {
+                                    "config": {
+                                        "$ref": "#/components/schemas/DataSourceCallParameters"
+                                    }
+                                },
+                                "type": "object"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/DataSourceResponse"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/requests/data_sources/{data_source_id}": {
+            "post": {
+                "tags": [
+                    "DataSources"
+                ],
+                "summary": "execute Data Source",
+                "operationId": "executeDataSource",
+                "parameters": [
+                    {
+                        "name": "data_source_id",
+                        "in": "path",
+                        "description": "ID of DataSource to be run",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "properties": {
+                                    "config": {
+                                        "$ref": "#/components/schemas/DataSourceCallParameters"
+                                    },
+                                    "data": {
+                                        "type": "object"
+                                    }
+                                },
+                                "type": "object"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/DataSourceResponse"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/requests/data_sources/{data_source_id}/resources/{endpoint}/data": {
+            "post": {
+                "tags": [
+                    "DataSources"
+                ],
+                "summary": "Get Data from Data Source",
+                "operationId": "getDataFromDataSource",
+                "parameters": [
+                    {
+                        "name": "data_source_id",
+                        "in": "path",
+                        "description": "ID of DataSource to be run",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "endpoint",
+                        "in": "path",
+                        "description": "Endpoint of the data source",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/DataSourceResponse"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/decision_table_categories": {
+            "get": {
+                "tags": [
+                    "DecisionTableCategories"
+                ],
+                "summary": "Returns all Decision Tables categories that the user has access to",
+                "description": "Display a listing of the Decision Tables Categories.",
+                "operationId": "getDecisionTableCategories",
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/filter"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    },
+                    {
+                        "$ref": "#/components/parameters/per_page"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of Decision Tables categories",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/DecisionTableCategory"
+                                            }
+                                        },
+                                        "meta": {
+                                            "type": "object",
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/components/schemas/metadata"
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "DecisionTableCategories"
+                ],
+                "summary": "Save a new Decision Table Category",
+                "description": "Store a newly created Decision Tables  Category in storage",
+                "operationId": "createDecisionTableCategory",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/decisionTableCategoryEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/DecisionTableCategory"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/decision_table_categories/{decision_table_categories_id}": {
+            "get": {
+                "tags": [
+                    "DecisionTableCategories"
+                ],
+                "summary": "Get single Decision Table category by ID",
+                "description": "Display the specified decision Tables category.",
+                "operationId": "getDecisionTableCategoryById",
+                "parameters": [
+                    {
+                        "name": "decision_table_categories_id",
+                        "in": "path",
+                        "description": "ID of Decision Table category to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully found the Decision Table",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/DecisionTableCategory"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "DecisionTableCategories"
+                ],
+                "summary": "Update a Decision Table Category",
+                "description": "Updates the current element",
+                "operationId": "updateDecisionTableCategory",
+                "parameters": [
+                    {
+                        "name": "decision_table_categories_id",
+                        "in": "path",
+                        "description": "ID of Decision Table category to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/decisionTableCategoryEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/DecisionTableCategory"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "DecisionTableCategories"
+                ],
+                "summary": "Delete a Decision Table category",
+                "description": "Remove the specified resource from storage.",
+                "operationId": "deleteDecisionTableCategory",
+                "parameters": [
+                    {
+                        "name": "decision_table_categories_id",
+                        "in": "path",
+                        "description": "ID of Decision Table category to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "success"
+                    }
+                }
+            }
+        },
+        "/decision_tables": {
+            "get": {
+                "tags": [
+                    "DecisionTables"
+                ],
+                "summary": "Returns all Decision tables that the user has access to",
+                "description": "Display a listing of the resource.",
+                "operationId": "getDecisionTables",
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/filter"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    },
+                    {
+                        "$ref": "#/components/parameters/per_page"
+                    },
+                    {
+                        "$ref": "#/components/parameters/include"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of Decision Tables",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/decisionTable"
+                                            }
+                                        },
+                                        "meta": {
+                                            "type": "object",
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/components/schemas/metadata"
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "DecisionTables"
+                ],
+                "summary": "Save a new Decision Table",
+                "description": "Store a newly created resource in storage.",
+                "operationId": "createDecisionTable",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/decisionTableEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/decisionTable"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/decision_tables/{decision_table_id}": {
+            "get": {
+                "tags": [
+                    "DecisionTables"
+                ],
+                "summary": "Get single Decision Table by ID",
+                "description": "Display the specified resource.",
+                "operationId": "getDecisionTableById",
+                "parameters": [
+                    {
+                        "name": "decision_table_id",
+                        "in": "path",
+                        "description": "ID of Decision Table to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully found the Decision Table",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/decisionTable"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "DecisionTables"
+                ],
+                "summary": "Update a Decision Table",
+                "description": "Update a Decision table",
+                "operationId": "updateDecisionTable",
+                "parameters": [
+                    {
+                        "name": "decision_table_id",
+                        "in": "path",
+                        "description": "ID of Decision Table to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/decisionTableEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "204": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/decisionTable"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "DecisionTables"
+                ],
+                "summary": "Delete a Decision Table",
+                "description": "Delete a Decision tables",
+                "operationId": "deleteDecisionTable",
+                "parameters": [
+                    {
+                        "name": "decision_table_id",
+                        "in": "path",
+                        "description": "ID of Decision Table to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/decisionTable"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/decision_tables/{decision_table_id}/duplicate": {
+            "put": {
+                "tags": [
+                    "DecisionTables"
+                ],
+                "summary": "duplicate a Decision Table",
+                "description": "duplicate a Decision table.",
+                "operationId": "duplicateDecisionTable",
+                "parameters": [
+                    {
+                        "name": "decision_table_id",
+                        "in": "path",
+                        "description": "ID of Decision Table to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/decisionTableEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/decisionTable"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/decision_tables/{decision_table_id}/excel-import": {
+            "post": {
+                "tags": [
+                    "DecisionTables"
+                ],
+                "summary": "Import a new decision table",
+                "description": "Import a Decision table from excel",
+                "operationId": "importExcel",
+                "parameters": [
+                    {
+                        "name": "decision_table_id",
+                        "in": "path",
+                        "description": "ID of Decision Table to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "multipart/form-data": {
+                            "schema": {
+                                "properties": {
+                                    "file": {
+                                        "description": "file to import",
+                                        "type": "string",
+                                        "format": "binary"
+                                    }
+                                },
+                                "type": "object"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "status": {
+                                            "type": "object"
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/decision_tables/{decision_table_id}/export": {
+            "post": {
+                "tags": [
+                    "DecisionTables"
+                ],
+                "summary": "Export a single Decision Table by ID",
+                "description": "Export the specified screen.",
+                "operationId": "exportDecisionTable",
+                "parameters": [
+                    {
+                        "name": "decision_table_id",
+                        "in": "path",
+                        "description": "ID of Decision Table to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully exported the decision table",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/DecisionTableExported"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/decision_tables/import": {
+            "post": {
+                "tags": [
+                    "DecisionTables"
+                ],
+                "summary": "Import a new Decision Table",
+                "description": "Import the specified Decision Table.",
+                "operationId": "importDecisionTable",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "multipart/form-data": {
+                            "schema": {
+                                "properties": {
+                                    "file": {
+                                        "description": "file to import",
+                                        "type": "string",
+                                        "format": "binary"
+                                    }
+                                },
+                                "type": "object"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "status": {
+                                            "type": "object"
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/decision_tables/{decision_table_id}/execute": {
+            "post": {
+                "tags": [
+                    "DecisionTables"
+                ],
+                "summary": "Execute a Decision Table definition",
+                "description": "Execute a Decision Table definition",
+                "operationId": "previewDecisionTable",
+                "parameters": [
+                    {
+                        "name": "decision_table_id",
+                        "in": "path",
+                        "description": "Decision Table unique Identifier",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully executed",
+                        "content": {
+                            "application/json": {
+                                "schema": {}
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/saved-searches/{saved_search_id}/charts": {
+            "get": {
+                "tags": [
+                    "SavedSearchCharts"
+                ],
+                "summary": "Returns all saved search charts that the user has access to",
+                "description": "Get a list of SavedSearchCharts.",
+                "operationId": "getSavedSearchCharts",
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/filter"
+                    },
+                    {
+                        "name": "type",
+                        "in": "query",
+                        "description": "Only return saved searches by type",
+                        "required": false,
+                        "schema": {
+                            "type": "string",
+                            "enum": [
+                                "request",
+                                "task",
+                                "collection"
+                            ]
+                        }
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    },
+                    {
+                        "$ref": "#/components/parameters/per_page"
+                    },
+                    {
+                        "$ref": "#/components/parameters/include"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of saved search charts",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/SavedSearchChart"
+                                            }
+                                        },
+                                        "meta": {
+                                            "type": "object",
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/components/schemas/metadata"
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "SavedSearchCharts"
+                ],
+                "summary": "Update several saved search charts at once",
+                "description": "Batch update several SavedSearchCharts.",
+                "operationId": "batchUpdateSavedSearchCharts",
+                "parameters": [
+                    {
+                        "name": "saved_search_id",
+                        "in": "path",
+                        "description": "ID of saved search to which these charts will be saved",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "type": "array",
+                                "items": {
+                                    "$ref": "#/components/schemas/SavedSearchChart"
+                                }
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "204": {
+                        "description": "success"
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "SavedSearchCharts"
+                ],
+                "summary": "Save a new saved search chart",
+                "description": "Create a new SavedSearchChart.",
+                "operationId": "createSavedSearchChart",
+                "parameters": [
+                    {
+                        "name": "saved_search_id",
+                        "in": "path",
+                        "description": "ID of saved search to which this chart will be saved",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/SavedSearchChartEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/SavedSearchChart"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/saved-searches/charts/{chart_id}": {
+            "get": {
+                "tags": [
+                    "SavedSearchCharts"
+                ],
+                "summary": "Get single saved search chart by ID",
+                "description": "Get a single SavedSearchChart.",
+                "operationId": "getSavedSearchChartById",
+                "parameters": [
+                    {
+                        "name": "chart_id",
+                        "in": "path",
+                        "description": "ID of chart to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully found the saved search chart",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/SavedSearchChart"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "SavedSearchCharts"
+                ],
+                "summary": "Update a saved search chart",
+                "description": "Update a SavedSearchChart.",
+                "operationId": "updateSavedSearchChart",
+                "parameters": [
+                    {
+                        "name": "chart_id",
+                        "in": "path",
+                        "description": "ID of chart to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/SavedSearchChartEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/SavedSearchChart"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "SavedSearchCharts"
+                ],
+                "summary": "Delete a saved search chart",
+                "description": "Delete a SavedSearchChart.",
+                "operationId": "deleteSavedSearchChart",
+                "parameters": [
+                    {
+                        "name": "chart_id",
+                        "in": "path",
+                        "description": "ID of chart to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "success"
+                    }
+                }
+            }
+        },
+        "/saved-searches/charts/{chart_id}/fields": {
+            "get": {
+                "tags": [
+                    "SavedSearchCharts"
+                ],
+                "summary": "Get available chart fields for a Saved Search by ID",
+                "description": "Get available chart fields for a Saved Search.",
+                "operationId": "getSavedSearchFieldsById",
+                "parameters": [
+                    {
+                        "name": "chart_id",
+                        "in": "path",
+                        "description": "ID of Saved Search to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully found the saved search",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/SavedSearch"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/saved-searches/qa/batch-create-requests": {
+            "post": {
+                "tags": [
+                    "SavedSearches"
+                ],
+                "summary": "Batch-create test process requests for saved search testing (QA only)",
+                "description": "Batch-create process requests via the seed-performance Artisan command.",
+                "operationId": "batchCreateRequests",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "required": [
+                                    "cases"
+                                ],
+                                "properties": {
+                                    "cases": {
+                                        "description": "Number of cases to create",
+                                        "type": "integer",
+                                        "example": 1000
+                                    },
+                                    "process_id": {
+                                        "description": "Reuse an existing process ID",
+                                        "type": "integer",
+                                        "nullable": true
+                                    },
+                                    "data_size": {
+                                        "description": "Target payload size in bytes (default 262144 = 256KB)",
+                                        "type": "integer",
+                                        "nullable": true
+                                    },
+                                    "status": {
+                                        "type": "string",
+                                        "default": "ACTIVE",
+                                        "enum": [
+                                            "ACTIVE",
+                                            "COMPLETED",
+                                            "ERROR",
+                                            "CANCELED"
+                                        ]
+                                    }
+                                },
+                                "type": "object"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "Requests created successfully",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "cases": {
+                                            "type": "integer"
+                                        },
+                                        "exit_code": {
+                                            "type": "integer"
+                                        },
+                                        "output": {
+                                            "type": "string"
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    },
+                    "403": {
+                        "description": "QA endpoint is disabled"
+                    },
+                    "422": {
+                        "description": "Command failed"
+                    }
+                }
+            }
+        },
+        "/saved-searches/reports": {
+            "post": {
+                "tags": [
+                    "Reports"
+                ],
+                "summary": "Save a new report",
+                "operationId": "createReport",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/ReportEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/Report"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/saved-searches/reports/{reportId}": {
+            "put": {
+                "tags": [
+                    "SavedSearches"
+                ],
+                "summary": "Update a saved search",
+                "description": "Update a Report",
+                "operationId": "updateReport",
+                "parameters": [
+                    {
+                        "name": "reportId",
+                        "in": "path",
+                        "description": "ID of report",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/SavedSearchEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/SavedSearch"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/saved-searches": {
+            "get": {
+                "tags": [
+                    "SavedSearches"
+                ],
+                "summary": "Returns all saved searches that the user has access to",
+                "description": "Get a list of SavedSearches.",
+                "operationId": "getSavedSearches",
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/filter"
+                    },
+                    {
+                        "name": "type",
+                        "in": "query",
+                        "description": "Only return saved searches by type",
+                        "required": false,
+                        "schema": {
+                            "type": "string",
+                            "enum": [
+                                "request",
+                                "task",
+                                "collection"
+                            ]
+                        }
+                    },
+                    {
+                        "name": "subset",
+                        "in": "query",
+                        "description": "Only return saved searches that are yours or those that have been shared with you",
+                        "required": false,
+                        "schema": {
+                            "type": "string",
+                            "enum": [
+                                "mine",
+                                "shared"
+                            ]
+                        }
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    },
+                    {
+                        "$ref": "#/components/parameters/per_page"
+                    },
+                    {
+                        "$ref": "#/components/parameters/include"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of saved searches",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/SavedSearch"
+                                            }
+                                        },
+                                        "meta": {
+                                            "type": "object",
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/components/schemas/metadata"
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "SavedSearches"
+                ],
+                "summary": "Save a new saved search",
+                "description": "Create a new SavedSearch.",
+                "operationId": "createSavedSearch",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/SavedSearchEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/SavedSearch"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/saved-searches/{savedSearchId}": {
+            "get": {
+                "tags": [
+                    "SavedSearches"
+                ],
+                "summary": "Get single saved searches by ID",
+                "description": "Get a single SavedSearch.",
+                "operationId": "getSavedSearchById",
+                "parameters": [
+                    {
+                        "name": "savedSearchId",
+                        "in": "path",
+                        "description": "ID of saved search to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully found the saved search",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/SavedSearch"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "SavedSearches"
+                ],
+                "summary": "Update a saved search",
+                "description": "Update a SavedSearch.",
+                "operationId": "updateSavedSearch",
+                "parameters": [
+                    {
+                        "name": "savedSearchId",
+                        "in": "path",
+                        "description": "ID of saved search to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/SavedSearchEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "200": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/SavedSearch"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/saved-searches/{savedSearchId}/columns": {
+            "get": {
+                "tags": [
+                    "SavedSearches"
+                ],
+                "summary": "Returns all columns associated with a Saved Search",
+                "description": "Display a listing of columns.",
+                "operationId": "getSavedSearchColumns",
+                "parameters": [
+                    {
+                        "name": "savedSearchId",
+                        "in": "path",
+                        "description": "ID of saved search to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "include",
+                        "in": "query",
+                        "description": "Include specific categories. Comma separated list.",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "type": "string",
+                                "enum": [
+                                    "current",
+                                    "default",
+                                    "available",
+                                    "data"
+                                ]
+                            },
+                            "uniqueItems": false
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Categorized list of columns",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "current": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/columns"
+                                            }
+                                        },
+                                        "default": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/columns"
+                                            }
+                                        },
+                                        "available": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/columns"
+                                            }
+                                        },
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/columns"
+                                            }
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/saved-searches/{savedSearchId}/users": {
+            "get": {
+                "tags": [
+                    "Users"
+                ],
+                "summary": "Returns all users",
+                "description": "Display a listing of the resource.",
+                "operationId": "getSavedSearchUsers",
+                "parameters": [
+                    {
+                        "name": "savedSearchId",
+                        "in": "path",
+                        "description": "ID of saved search to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "name": "filter",
+                        "in": "query",
+                        "description": "Filter results by string. Searches First Name, Last Name, Email and Username.",
+                        "schema": {
+                            "type": "string"
+                        }
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    },
+                    {
+                        "$ref": "#/components/parameters/per_page"
+                    },
+                    {
+                        "$ref": "#/components/parameters/include"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of users",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/users"
+                                            }
+                                        },
+                                        "meta": {
+                                            "$ref": "#/components/schemas/metadata"
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/saved-searches/{savedSearchId}/groups": {
+            "get": {
+                "tags": [
+                    "Groups"
+                ],
+                "summary": "Returns all groups that the user has access to",
+                "description": "Display a listing of the resource.",
+                "operationId": "getSavedSearchGroups",
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    },
+                    {
+                        "$ref": "#/components/parameters/per_page"
+                    },
+                    {
+                        "$ref": "#/components/parameters/include"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of groups",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/groups"
+                                            }
+                                        },
+                                        "meta": {
+                                            "$ref": "#/components/schemas/metadata"
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/saved-searches/{saved_search_id}": {
+            "delete": {
+                "tags": [
+                    "SavedSearches"
+                ],
+                "summary": "Delete a saved search",
+                "description": "Delete a SavedSearch.",
+                "operationId": "deleteSavedSearch",
+                "parameters": [
+                    {
+                        "name": "saved_search_id",
+                        "in": "path",
+                        "description": "ID of saved search to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "success"
+                    }
+                }
+            }
+        },
+        "/saved-searches/icons": {
+            "get": {
+                "tags": [
+                    "SavedSearches"
+                ],
+                "summary": "Returns all icons for saved searches",
+                "description": "Get a list of icons available for SavedSearches.",
+                "operationId": "getSavedSearchesIcons",
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/per_page"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of icons for saved searches",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/SavedSearchIcon"
+                                            }
+                                        },
+                                        "meta": {
+                                            "type": "object",
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/components/schemas/metadata"
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/version_histories": {
+            "get": {
+                "tags": [
+                    "Version History"
+                ],
+                "summary": "Return all version History according to the model",
+                "description": "Get the list of records of Version History",
+                "operationId": "getVersionHistories",
+                "parameters": [
+                    {
+                        "$ref": "#/components/parameters/filter"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_by"
+                    },
+                    {
+                        "$ref": "#/components/parameters/order_direction"
+                    },
+                    {
+                        "$ref": "#/components/parameters/per_page"
+                    },
+                    {
+                        "$ref": "#/components/parameters/include"
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "list of Version History",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "properties": {
+                                        "data": {
+                                            "type": "array",
+                                            "items": {
+                                                "$ref": "#/components/schemas/versionHistory"
+                                            }
+                                        },
+                                        "meta": {
+                                            "type": "object",
+                                            "allOf": [
+                                                {
+                                                    "$ref": "#/components/schemas/metadata"
+                                                }
+                                            ]
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "post": {
+                "tags": [
+                    "Version History"
+                ],
+                "summary": "Save a new Version History",
+                "description": "Create a new Version History.",
+                "operationId": "createVersion",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/versionHistoryEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/versionHistory"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/version_histories/{version_history_id}": {
+            "get": {
+                "tags": [
+                    "Version History"
+                ],
+                "summary": "Get single Version History by ID",
+                "description": "Get a single Version History.",
+                "operationId": "getVersionHistoryById",
+                "parameters": [
+                    {
+                        "name": "version_history_id",
+                        "in": "path",
+                        "description": "ID of Version History to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "Successfully found the Version History",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/versionHistory"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "put": {
+                "tags": [
+                    "Version History"
+                ],
+                "summary": "Update a Version History",
+                "description": "Update a Version History.",
+                "operationId": "updateVersion",
+                "parameters": [
+                    {
+                        "name": "version_history_id",
+                        "in": "path",
+                        "description": "ID of Version History to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/versionHistoryEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "204": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/versionHistory"
+                                }
+                            }
+                        }
+                    }
+                }
+            },
+            "delete": {
+                "tags": [
+                    "Version History"
+                ],
+                "summary": "Delete a Version History",
+                "description": "Delete a Version History.",
+                "operationId": "deleteVersion",
+                "parameters": [
+                    {
+                        "name": "version_history_id",
+                        "in": "path",
+                        "description": "ID of Version History to return",
+                        "required": true,
+                        "schema": {
+                            "type": "string"
+                        }
+                    }
+                ],
+                "responses": {
+                    "204": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/versionHistory"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        },
+        "/version_histories/clone": {
+            "post": {
+                "tags": [
+                    "Version History"
+                ],
+                "summary": "Clone a new Version History",
+                "description": "Clone a new Version History.",
+                "operationId": "cloneVersion",
+                "requestBody": {
+                    "required": true,
+                    "content": {
+                        "application/json": {
+                            "schema": {
+                                "$ref": "#/components/schemas/versionHistoryEditable"
+                            }
+                        }
+                    }
+                },
+                "responses": {
+                    "201": {
+                        "description": "success",
+                        "content": {
+                            "application/json": {
+                                "schema": {
+                                    "$ref": "#/components/schemas/versionHistory"
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    },
+    "components": {
+        "schemas": {
+            "DateTime": {
+                "properties": {
+                    "date": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "updateUserGroups": {
+                "properties": {
+                    "groups": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer",
+                            "example": 1
+                        }
+                    }
+                },
+                "type": "object"
+            },
+            "restoreUser": {
+                "properties": {
+                    "username": {
+                        "description": "Username to restore",
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "Variable": {
+                "properties": {
+                    "id": {
+                        "type": "integer",
+                        "example": 1
+                    },
+                    "process_id": {
+                        "type": "integer",
+                        "example": 1
+                    },
+                    "uuid": {
+                        "type": "string",
+                        "format": "uuid",
+                        "example": "550e8400-e29b-41d4-a716-446655440000"
+                    },
+                    "field": {
+                        "type": "string",
+                        "example": "string",
+                        "enum": [
+                            "string",
+                            "number",
+                            "boolean",
+                            "array"
+                        ]
+                    },
+                    "label": {
+                        "type": "string",
+                        "example": "Variable 1 for Process 1"
+                    },
+                    "name": {
+                        "type": "string",
+                        "example": "var_1_1"
+                    },
+                    "asset": {
+                        "properties": {
+                            "id": {
+                                "type": "string",
+                                "example": "asset_1_1"
+                            },
+                            "type": {
+                                "type": "string",
+                                "example": "sensor",
+                                "enum": [
+                                    "sensor",
+                                    "actuator",
+                                    "controller",
+                                    "device"
+                                ]
+                            },
+                            "name": {
+                                "type": "string",
+                                "example": "Asset 1 for Process 1"
+                            },
+                            "uuid": {
+                                "type": "string",
+                                "format": "uuid",
+                                "example": "550e8400-e29b-41d4-a716-446655440000"
+                            }
+                        },
+                        "type": "object"
+                    },
+                    "created_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "updated_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    }
+                },
+                "type": "object"
+            },
+            "PaginationMeta": {
+                "properties": {
+                    "current_page": {
+                        "type": "integer",
+                        "example": 1
+                    },
+                    "from": {
+                        "type": "integer",
+                        "example": 1
+                    },
+                    "last_page": {
+                        "type": "integer",
+                        "example": 5
+                    },
+                    "path": {
+                        "type": "string",
+                        "example": "http://processmaker.com/processes/variables"
+                    },
+                    "per_page": {
+                        "type": "integer",
+                        "example": 20
+                    },
+                    "to": {
+                        "type": "integer",
+                        "example": 20
+                    },
+                    "total": {
+                        "type": "integer",
+                        "example": 100
+                    },
+                    "links": {
+                        "properties": {
+                            "first": {
+                                "type": "string",
+                                "example": "http://processmaker.com/processes/variables?page=1"
+                            },
+                            "last": {
+                                "type": "string",
+                                "example": "http://processmaker.com/processes/variables?page=5"
+                            },
+                            "prev": {
+                                "type": "string",
+                                "nullable": true
+                            },
+                            "next": {
+                                "type": "string",
+                                "example": "http://processmaker.com/processes/variables?page=2"
+                            }
+                        },
+                        "type": "object"
+                    }
+                },
+                "type": "object"
+            },
+            "metadata": {
+                "properties": {
+                    "filter": {
+                        "type": "string"
+                    },
+                    "sort_by": {
+                        "type": "string"
+                    },
                     "sort_order": {
                         "type": "string",
-                        "enum": [
-                            "asc",
-                            "desc"
-                        ]
+                        "enum": [
+                            "asc",
+                            "desc"
+                        ]
+                    },
+                    "count": {
+                        "type": "integer"
+                    },
+                    "total_pages": {
+                        "type": "integer"
+                    },
+                    "current_page": {
+                        "type": "integer"
+                    },
+                    "form": {
+                        "type": "integer"
+                    },
+                    "last_page": {
+                        "type": "integer"
+                    },
+                    "path": {
+                        "type": "string"
+                    },
+                    "per_page": {
+                        "type": "integer"
+                    },
+                    "to": {
+                        "type": "integer"
+                    },
+                    "total": {
+                        "type": "integer"
+                    }
+                },
+                "type": "object"
+            },
+            "taskMetadata": {
+                "type": "object",
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/metadata"
+                    },
+                    {
+                        "properties": {
+                            "filter": {
+                                "type": "string"
+                            },
+                            "sort_by": {
+                                "type": "string"
+                            },
+                            "sort_order": {
+                                "type": "string",
+                                "enum": [
+                                    "asc",
+                                    "desc"
+                                ]
+                            },
+                            "count": {
+                                "type": "integer"
+                            },
+                            "total_pages": {
+                                "type": "integer"
+                            },
+                            "current_page": {
+                                "type": "integer"
+                            },
+                            "form": {
+                                "type": "integer"
+                            },
+                            "last_page": {
+                                "type": "integer"
+                            },
+                            "path": {
+                                "type": "string"
+                            },
+                            "per_page": {
+                                "type": "integer"
+                            },
+                            "to": {
+                                "type": "integer"
+                            },
+                            "total": {
+                                "type": "integer"
+                            },
+                            "in_overdue": {
+                                "type": "integer"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "signalsEditable": {
+                "properties": {
+                    "id": {
+                        "description": "Represents a business signal definition.",
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "detail": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "signals": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/signalsEditable"
+                    },
+                    {
+                        "properties": {
+                            "type": {
+                                "type": "string"
+                            },
+                            "processes": {
+                                "type": "array",
+                                "items": {
+                                    "properties": {
+                                        "id": {
+                                            "type": "integer",
+                                            "format": "id"
+                                        },
+                                        "is_system": {
+                                            "type": "boolean"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "catches": {
+                                            "type": "array",
+                                            "items": {
+                                                "properties": {
+                                                    "id": {
+                                                        "type": "integer",
+                                                        "format": "id"
+                                                    },
+                                                    "name": {
+                                                        "type": "string"
+                                                    },
+                                                    "type": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "type": "object"
+                                            }
+                                        }
+                                    },
+                                    "type": "object"
+                                }
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "columns": {
+                "properties": {
+                    "label": {
+                        "type": "string"
+                    },
+                    "field": {
+                        "type": "string"
+                    },
+                    "sortable": {
+                        "type": "boolean"
+                    },
+                    "default": {
+                        "type": "boolean"
+                    },
+                    "format": {
+                        "type": "string"
+                    },
+                    "mask": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "commentsEditable": {
+                "properties": {
+                    "id": {
+                        "description": "Represents a business process definition.",
+                        "type": "string",
+                        "format": "id"
                     },
-                    "count": {
-                        "type": "integer"
+                    "user_id": {
+                        "type": "string",
+                        "format": "id"
                     },
-                    "total_pages": {
-                        "type": "integer"
+                    "commentable_id": {
+                        "type": "string",
+                        "format": "id"
                     },
-                    "current_page": {
-                        "type": "integer"
+                    "commentable_type": {
+                        "type": "string"
                     },
-                    "form": {
+                    "up": {
                         "type": "integer"
                     },
-                    "last_page": {
+                    "down": {
                         "type": "integer"
                     },
-                    "path": {
+                    "subject": {
                         "type": "string"
                     },
-                    "per_page": {
-                        "type": "integer"
+                    "body": {
+                        "type": "string"
                     },
-                    "to": {
-                        "type": "integer"
+                    "hidden": {
+                        "type": "boolean"
                     },
-                    "total": {
-                        "type": "integer"
+                    "type": {
+                        "type": "string",
+                        "enum": [
+                            "LOG",
+                            "MESSAGE"
+                        ]
+                    }
+                },
+                "type": "object"
+            },
+            "comments": {
+                "type": "object",
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/commentsEditable"
+                    },
+                    {
+                        "properties": {
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "EnvironmentVariableEditable": {
+                "properties": {
+                    "name": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "asset_type": {
+                        "type": "string",
+                        "nullable": true
+                    },
+                    "do_not_update": {
+                        "type": "boolean"
+                    }
+                },
+                "type": "object"
+            },
+            "EnvironmentVariable": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/EnvironmentVariableEditable"
+                    },
+                    {
+                        "properties": {
+                            "id": {
+                                "type": "integer",
+                                "format": "id"
+                            },
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "groupsEditable": {
+                "properties": {
+                    "name": {
+                        "description": "Represents a group definition.",
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "manager_id": {
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "status": {
+                        "type": "string",
+                        "enum": [
+                            "ACTIVE",
+                            "INACTIVE"
+                        ]
+                    }
+                },
+                "type": "object"
+            },
+            "groups": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/groupsEditable"
+                    },
+                    {
+                        "properties": {
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "groupMembersEditable": {
+                "properties": {
+                    "group_id": {
+                        "description": "Represents a group Members definition.",
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "member_id": {
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "member_type": {
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "groupMembers": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/groupMembersEditable"
+                    },
+                    {
+                        "properties": {
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
+                        },
+                        "type": "object"
                     }
-                },
-                "type": "object"
+                ]
             },
-            "taskMetadata": {
-                "type": "object",
+            "createGroupMembers": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/metadata"
+                        "$ref": "#/components/schemas/groupMembersEditable"
                     },
                     {
                         "properties": {
-                            "filter": {
-                                "type": "string"
+                            "id": {
+                                "type": "string",
+                                "format": "id"
                             },
-                            "sort_by": {
-                                "type": "string"
+                            "group": {
+                                "type": "object"
                             },
-                            "sort_order": {
+                            "member": {
+                                "type": "object"
+                            },
+                            "created_at": {
                                 "type": "string",
-                                "enum": [
-                                    "asc",
-                                    "desc"
-                                ]
+                                "format": "date-time"
                             },
-                            "count": {
-                                "type": "integer"
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "getGroupMembersById": {
+                "allOf": [
+                    {
+                        "properties": {
+                            "group_id": {
+                                "type": "string",
+                                "format": "id"
                             },
-                            "total_pages": {
-                                "type": "integer"
+                            "member_id": {
+                                "type": "string",
+                                "format": "id"
                             },
-                            "current_page": {
-                                "type": "integer"
+                            "member_type": {
+                                "type": "string"
                             },
-                            "form": {
-                                "type": "integer"
+                            "id": {
+                                "type": "string",
+                                "format": "id"
                             },
-                            "last_page": {
-                                "type": "integer"
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
                             },
-                            "path": {
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "availableGroupMembers": {
+                "allOf": [
+                    {
+                        "properties": {
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "description": {
                                 "type": "string"
                             },
-                            "per_page": {
-                                "type": "integer"
+                            "name": {
+                                "type": "string"
                             },
-                            "to": {
-                                "type": "integer"
+                            "status": {
+                                "type": "string",
+                                "enum": [
+                                    "ACTIVE",
+                                    "INACTIVE"
+                                ]
                             },
-                            "total": {
-                                "type": "integer"
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
                             },
-                            "in_overdue": {
-                                "type": "integer"
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "signalsEditable": {
+            "mediaEditable": {
                 "properties": {
                     "id": {
-                        "description": "Represents a business signal definition.",
+                        "description": "Represents media files stored in the database",
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "model_id": {
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "model_type": {
                         "type": "string",
                         "format": "id"
                     },
+                    "collection_name": {
+                        "type": "string"
+                    },
                     "name": {
                         "type": "string"
                     },
-                    "detail": {
+                    "file_name": {
+                        "type": "string"
+                    },
+                    "mime_type": {
                         "type": "string"
+                    },
+                    "disk": {
+                        "type": "string"
+                    },
+                    "size": {
+                        "type": "integer"
+                    },
+                    "manipulations": {
+                        "type": "object"
+                    },
+                    "custom_properties": {
+                        "type": "object"
+                    },
+                    "responsive_images": {
+                        "type": "object"
+                    },
+                    "order_column": {
+                        "type": "integer"
                     }
                 },
                 "type": "object"
             },
-            "signals": {
+            "media": {
+                "type": "object",
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/signalsEditable"
+                        "$ref": "#/components/schemas/mediaEditable"
                     },
                     {
                         "properties": {
-                            "type": {
-                                "type": "string"
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
                             },
-                            "processes": {
-                                "type": "array",
-                                "items": {
-                                    "properties": {
-                                        "id": {
-                                            "type": "integer",
-                                            "format": "id"
-                                        },
-                                        "is_system": {
-                                            "type": "boolean"
-                                        },
-                                        "name": {
-                                            "type": "string"
-                                        },
-                                        "catches": {
-                                            "type": "array",
-                                            "items": {
-                                                "properties": {
-                                                    "id": {
-                                                        "type": "integer",
-                                                        "format": "id"
-                                                    },
-                                                    "name": {
-                                                        "type": "string"
-                                                    },
-                                                    "type": {
-                                                        "type": "string"
-                                                    }
-                                                },
-                                                "type": "object"
-                                            }
-                                        }
-                                    },
-                                    "type": "object"
-                                }
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "mediaExported": {
+                "properties": {
+                    "url": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "NotificationEditable": {
+                "properties": {
+                    "type": {
+                        "description": "Represents a notification definition.",
+                        "type": "string"
+                    },
+                    "notifiable_type": {
+                        "type": "string"
+                    },
+                    "notifiable_id": {
+                        "type": "integer"
+                    },
+                    "data": {
+                        "type": "string"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "message": {
+                        "type": "string"
+                    },
+                    "processName": {
+                        "type": "string"
+                    },
+                    "userName": {
+                        "type": "string"
+                    },
+                    "request_id": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "Notification": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/NotificationEditable"
+                    },
+                    {
+                        "properties": {
+                            "id": {
+                                "type": "string"
+                            },
+                            "read_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "columns": {
+            "ProcessEditable": {
                 "properties": {
-                    "label": {
-                        "type": "string"
+                    "process_category_id": {
+                        "description": "Represents a business process definition.",
+                        "type": "integer",
+                        "format": "id"
                     },
-                    "field": {
+                    "name": {
                         "type": "string"
                     },
-                    "sortable": {
-                        "type": "boolean"
-                    },
-                    "default": {
-                        "type": "boolean"
-                    },
-                    "format": {
+                    "case_title": {
                         "type": "string"
                     },
-                    "mask": {
+                    "description": {
                         "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "commentsEditable": {
-                "properties": {
-                    "id": {
-                        "description": "Represents a business process definition.",
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "user_id": {
-                        "type": "string",
-                        "format": "id"
                     },
-                    "commentable_id": {
+                    "status": {
                         "type": "string",
-                        "format": "id"
+                        "enum": [
+                            "ACTIVE",
+                            "INACTIVE",
+                            "ARCHIVED"
+                        ]
                     },
-                    "commentable_type": {
-                        "type": "string"
+                    "pause_timer_start": {
+                        "type": "integer"
                     },
-                    "up": {
+                    "cancel_screen_id": {
                         "type": "integer"
                     },
-                    "down": {
+                    "has_timer_start_events": {
+                        "type": "boolean"
+                    },
+                    "request_detail_screen_id": {
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "is_valid": {
                         "type": "integer"
                     },
-                    "subject": {
+                    "package_key": {
                         "type": "string"
                     },
-                    "body": {
+                    "start_events": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/components/schemas/ProcessStartEvents"
+                        }
+                    },
+                    "warnings": {
                         "type": "string"
                     },
-                    "hidden": {
-                        "type": "boolean"
+                    "self_service_tasks": {
+                        "type": "object"
                     },
-                    "type": {
-                        "type": "string",
-                        "enum": [
-                            "LOG",
-                            "MESSAGE"
-                        ]
+                    "signal_events": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
+                    },
+                    "category": {
+                        "type": "object"
+                    },
+                    "manager_id": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer",
+                            "format": "id"
+                        }
                     }
                 },
                 "type": "object"
             },
-            "comments": {
-                "type": "object",
+            "Process": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/commentsEditable"
+                        "$ref": "#/components/schemas/ProcessEditable"
                     },
                     {
                         "properties": {
+                            "user_id": {
+                                "type": "integer",
+                                "format": "id"
+                            },
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "deleted_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -6465,35 +9759,126 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
+                            },
+                            "notifications": {
+                                "type": "object"
+                            },
+                            "task_notifications": {
+                                "type": "object"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "EnvironmentVariableEditable": {
+            "ProcessStartEvents": {
                 "properties": {
-                    "name": {
+                    "eventDefinitions": {
+                        "type": "object"
+                    },
+                    "parallelMultiple": {
+                        "type": "boolean"
+                    },
+                    "outgoing": {
+                        "type": "object"
+                    },
+                    "incoming": {
+                        "type": "object"
+                    },
+                    "id": {
                         "type": "string"
                     },
-                    "description": {
+                    "name": {
                         "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "ProcessWithStartEvents": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/Process"
                     },
-                    "value": {
+                    {
+                        "properties": {
+                            "events": {
+                                "type": "array",
+                                "items": {
+                                    "$ref": "#/components/schemas/ProcessStartEvents"
+                                }
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "ProcessImport": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/ProcessEditable"
+                    },
+                    {
+                        "properties": {
+                            "status": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object"
+                                }
+                            },
+                            "assignable": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object"
+                                }
+                            },
+                            "process": {}
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "ProcessAssignments": {
+                "properties": {
+                    "assignable": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
+                    },
+                    "cancel_request": {
+                        "type": "object"
+                    },
+                    "edit_data": {
+                        "type": "object"
+                    }
+                },
+                "type": "object"
+            },
+            "ProcessCategoryEditable": {
+                "properties": {
+                    "name": {
+                        "description": "Represents a business process category definition.",
                         "type": "string"
+                    },
+                    "status": {
+                        "type": "string",
+                        "enum": [
+                            "ACTIVE",
+                            "INACTIVE"
+                        ]
                     }
                 },
                 "type": "object"
             },
-            "EnvironmentVariable": {
+            "ProcessCategory": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/EnvironmentVariableEditable"
+                        "$ref": "#/components/schemas/ProcessCategoryEditable"
                     },
                     {
                         "properties": {
                             "id": {
-                                "type": "integer",
+                                "type": "string",
                                 "format": "id"
                             },
                             "created_at": {
@@ -6509,33 +9894,36 @@
                     }
                 ]
             },
-            "groupsEditable": {
+            "processPermissionsEditable": {
                 "properties": {
-                    "name": {
-                        "description": "Represents a group definition.",
-                        "type": "string"
+                    "id": {
+                        "description": "Represents a Process permission.",
+                        "type": "integer",
+                        "format": "id"
                     },
-                    "description": {
-                        "type": "string"
+                    "process_id": {
+                        "type": "integer",
+                        "format": "id"
                     },
-                    "manager_id": {
+                    "permission_id": {
                         "type": "integer",
                         "format": "id"
                     },
-                    "status": {
-                        "type": "string",
-                        "enum": [
-                            "ACTIVE",
-                            "INACTIVE"
-                        ]
+                    "assignable_id": {
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "assignable_type": {
+                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "groups": {
+            "processPermissions": {
+                "type": "object",
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/groupsEditable"
+                        "$ref": "#/components/schemas/processPermissionsEditable"
                     },
                     {
                         "properties": {
@@ -6546,40 +9934,63 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
-                            },
-                            "id": {
-                                "type": "string",
-                                "format": "id"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "groupMembersEditable": {
+            "processRequestEditable": {
                 "properties": {
-                    "group_id": {
-                        "description": "Represents a group Members definition.",
+                    "user_id": {
+                        "description": "Represents an Eloquent model of a Request which is an instance of a Process.",
                         "type": "string",
                         "format": "id"
                     },
-                    "member_id": {
+                    "callable_id": {
                         "type": "string",
                         "format": "id"
                     },
-                    "member_type": {
+                    "data": {
+                        "type": "object"
+                    },
+                    "status": {
+                        "type": "string",
+                        "enum": [
+                            "ACTIVE",
+                            "COMPLETED",
+                            "ERROR",
+                            "CANCELED"
+                        ]
+                    },
+                    "name": {
                         "type": "string"
                     },
-                    "description": {
+                    "case_title": {
+                        "type": "string"
+                    },
+                    "case_title_formatted": {
+                        "type": "string"
+                    },
+                    "user_viewed_at": {
                         "type": "string"
+                    },
+                    "case_number": {
+                        "type": "integer"
+                    },
+                    "process_id": {
+                        "type": "integer"
+                    },
+                    "process": {
+                        "type": "object"
                     }
                 },
                 "type": "object"
             },
-            "groupMembers": {
+            "processRequest": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/groupMembersEditable"
+                        "$ref": "#/components/schemas/processRequestEditable"
                     },
                     {
                         "properties": {
@@ -6587,6 +9998,22 @@
                                 "type": "string",
                                 "format": "id"
                             },
+                            "process_id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "process_collaboration_id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "participant_id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "process_category_id": {
+                                "type": "string",
+                                "format": "id"
+                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -6594,16 +10021,54 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
+                            },
+                            "user": {},
+                            "participants": {
+                                "type": "array",
+                                "items": {
+                                    "$ref": "#/components/schemas/users"
+                                }
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "createGroupMembers": {
+            "processRequestTokenEditable": {
+                "properties": {
+                    "user_id": {
+                        "description": "ProcessRequestToken is used to store the state of a token of the\nNayra engine",
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "due_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "initiated_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "riskchanges_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "subprocess_start_event_id": {
+                        "type": "string"
+                    },
+                    "data": {
+                        "type": "object"
+                    }
+                },
+                "type": "object"
+            },
+            "processRequestToken": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/groupMembersEditable"
+                        "$ref": "#/components/schemas/processRequestTokenEditable"
                     },
                     {
                         "properties": {
@@ -6611,43 +10076,27 @@
                                 "type": "string",
                                 "format": "id"
                             },
-                            "group": {
-                                "type": "object"
-                            },
-                            "member": {
-                                "type": "object"
-                            },
-                            "created_at": {
+                            "process_id": {
                                 "type": "string",
-                                "format": "date-time"
+                                "format": "id"
                             },
-                            "updated_at": {
+                            "process_request_id": {
                                 "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "getGroupMembersById": {
-                "allOf": [
-                    {
-                        "properties": {
-                            "group_id": {
+                                "format": "id"
+                            },
+                            "element_id": {
                                 "type": "string",
                                 "format": "id"
                             },
-                            "member_id": {
+                            "element_type": {
                                 "type": "string",
                                 "format": "id"
                             },
-                            "member_type": {
+                            "element_index": {
                                 "type": "string"
                             },
-                            "id": {
-                                "type": "string",
-                                "format": "id"
+                            "element_name": {
+                                "type": "string"
                             },
                             "created_at": {
                                 "type": "string",
@@ -6656,33 +10105,68 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
+                            },
+                            "initiated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "advanceStatus": {
+                                "type": "string"
+                            },
+                            "due_notified": {
+                                "type": "integer"
+                            },
+                            "user": {
+                                "type": "object"
+                            },
+                            "process": {
+                                "type": "object"
+                            },
+                            "process_request": {
+                                "type": "object"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "availableGroupMembers": {
+            "taskAssignmentsEditable": {
+                "properties": {
+                    "process_id": {
+                        "description": "Represents a business process task assignment definition.",
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "process_task_id": {
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "assignment_id": {
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "assignment_type": {
+                        "type": "string",
+                        "enum": [
+                            "ProcessMaker\\Models\\User",
+                            "ProcessMaker\\Models\\Group"
+                        ]
+                    }
+                },
+                "type": "object"
+            },
+            "taskAssignments": {
+                "type": "object",
                 "allOf": [
+                    {
+                        "$ref": "#/components/schemas/taskAssignmentsEditable"
+                    },
                     {
                         "properties": {
                             "id": {
-                                "type": "string",
+                                "type": "integer",
                                 "format": "id"
                             },
-                            "description": {
-                                "type": "string"
-                            },
-                            "name": {
-                                "type": "string"
-                            },
-                            "status": {
-                                "type": "string",
-                                "enum": [
-                                    "ACTIVE",
-                                    "INACTIVE"
-                                ]
-                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -6696,62 +10180,56 @@
                     }
                 ]
             },
-            "mediaEditable": {
+            "screensEditable": {
                 "properties": {
-                    "id": {
-                        "description": "Represents media files stored in the database",
-                        "type": "integer",
-                        "format": "id"
-                    },
-                    "model_id": {
-                        "type": "integer",
-                        "format": "id"
-                    },
-                    "model_type": {
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "collection_name": {
-                        "type": "string"
-                    },
-                    "name": {
-                        "type": "string"
-                    },
-                    "file_name": {
+                    "title": {
+                        "description": "Class Screen",
                         "type": "string"
                     },
-                    "mime_type": {
+                    "type": {
                         "type": "string"
                     },
-                    "disk": {
+                    "description": {
                         "type": "string"
                     },
-                    "size": {
-                        "type": "integer"
+                    "config": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
                     },
-                    "manipulations": {
-                        "type": "object"
+                    "computed": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
                     },
-                    "custom_properties": {
-                        "type": "object"
+                    "watchers": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
                     },
-                    "responsive_images": {
-                        "type": "object"
+                    "custom_css": {
+                        "type": "string"
                     },
-                    "order_column": {
-                        "type": "integer"
+                    "screen_category_id": {
+                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "media": {
-                "type": "object",
+            "screens": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/mediaEditable"
+                        "$ref": "#/components/schemas/screensEditable"
                     },
                     {
                         "properties": {
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -6765,7 +10243,7 @@
                     }
                 ]
             },
-            "mediaExported": {
+            "screenExported": {
                 "properties": {
                     "url": {
                         "type": "string"
@@ -6773,55 +10251,32 @@
                 },
                 "type": "object"
             },
-            "NotificationEditable": {
+            "ScreenCategoryEditable": {
                 "properties": {
-                    "type": {
-                        "description": "Represents a notification definition.",
-                        "type": "string"
-                    },
-                    "notifiable_type": {
-                        "type": "string"
-                    },
-                    "notifiable_id": {
-                        "type": "integer"
-                    },
-                    "data": {
-                        "type": "string"
-                    },
                     "name": {
+                        "description": "Represents a business screen category definition.",
                         "type": "string"
                     },
-                    "message": {
-                        "type": "string"
-                    },
-                    "processName": {
-                        "type": "string"
-                    },
-                    "userName": {
-                        "type": "string"
-                    },
-                    "request_id": {
-                        "type": "string"
-                    },
-                    "url": {
-                        "type": "string"
+                    "status": {
+                        "type": "string",
+                        "enum": [
+                            "ACTIVE",
+                            "INACTIVE"
+                        ]
                     }
                 },
                 "type": "object"
             },
-            "Notification": {
+            "ScreenCategory": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/NotificationEditable"
+                        "$ref": "#/components/schemas/ScreenCategoryEditable"
                     },
                     {
                         "properties": {
                             "id": {
-                                "type": "string"
-                            },
-                            "read_at": {
                                 "type": "string",
-                                "format": "date-time"
+                                "format": "id"
                             },
                             "created_at": {
                                 "type": "string",
@@ -6836,99 +10291,72 @@
                     }
                 ]
             },
-            "ProcessEditable": {
+            "ScreenTypeEditable": {
                 "properties": {
-                    "process_category_id": {
-                        "description": "Represents a business process definition.",
-                        "type": "integer",
-                        "format": "id"
-                    },
                     "name": {
+                        "description": "Represents a business screen Type definition.",
                         "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "ScreenType": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/ScreenTypeEditable"
                     },
-                    "case_title": {
+                    {
+                        "properties": {
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "scriptsEditable": {
+                "properties": {
+                    "title": {
+                        "description": "Represents an Eloquent model of a Script",
                         "type": "string"
                     },
                     "description": {
                         "type": "string"
                     },
-                    "status": {
-                        "type": "string",
-                        "enum": [
-                            "ACTIVE",
-                            "INACTIVE",
-                            "ARCHIVED"
-                        ]
+                    "language": {
+                        "type": "string"
                     },
-                    "pause_timer_start": {
-                        "type": "integer"
+                    "code": {
+                        "type": "string"
                     },
-                    "cancel_screen_id": {
+                    "timeout": {
                         "type": "integer"
                     },
-                    "has_timer_start_events": {
-                        "type": "boolean"
-                    },
-                    "request_detail_screen_id": {
-                        "type": "integer",
-                        "format": "id"
-                    },
-                    "is_valid": {
+                    "run_as_user_id": {
                         "type": "integer"
                     },
-                    "package_key": {
-                        "type": "string"
-                    },
-                    "start_events": {
-                        "type": "array",
-                        "items": {
-                            "$ref": "#/components/schemas/ProcessStartEvents"
-                        }
-                    },
-                    "warnings": {
+                    "key": {
                         "type": "string"
                     },
-                    "self_service_tasks": {
-                        "type": "object"
-                    },
-                    "signal_events": {
-                        "type": "array",
-                        "items": {
-                            "type": "object"
-                        }
-                    },
-                    "category": {
-                        "type": "object"
-                    },
-                    "manager_id": {
-                        "type": "array",
-                        "items": {
-                            "type": "integer",
-                            "format": "id"
-                        }
+                    "script_category_id": {
+                        "type": "integer"
                     }
                 },
                 "type": "object"
             },
-            "Process": {
+            "scripts": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/ProcessEditable"
+                        "$ref": "#/components/schemas/scriptsEditable"
                     },
                     {
                         "properties": {
-                            "user_id": {
-                                "type": "integer",
-                                "format": "id"
-                            },
                             "id": {
-                                "type": "string",
+                                "type": "integer",
                                 "format": "id"
                             },
-                            "deleted_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -6936,121 +10364,228 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
-                            },
-                            "notifications": {
-                                "type": "object"
-                            },
-                            "task_notifications": {
-                                "type": "object"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "ProcessStartEvents": {
+            "scriptsPreview": {
                 "properties": {
-                    "eventDefinitions": {
-                        "type": "object"
-                    },
-                    "parallelMultiple": {
-                        "type": "boolean"
-                    },
-                    "outgoing": {
-                        "type": "object"
-                    },
-                    "incoming": {
-                        "type": "object"
+                    "status": {
+                        "type": "string"
                     },
-                    "id": {
+                    "key": {
                         "type": "string"
                     },
+                    "output": {
+                        "type": "object"
+                    }
+                },
+                "type": "object"
+            },
+            "ScriptCategoryEditable": {
+                "properties": {
                     "name": {
+                        "description": "Represents a business script category definition.",
                         "type": "string"
+                    },
+                    "status": {
+                        "type": "string",
+                        "enum": [
+                            "ACTIVE",
+                            "INACTIVE"
+                        ]
                     }
                 },
                 "type": "object"
             },
-            "ProcessWithStartEvents": {
+            "ScriptCategory": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/Process"
+                        "$ref": "#/components/schemas/ScriptCategoryEditable"
                     },
                     {
                         "properties": {
-                            "events": {
-                                "type": "array",
-                                "items": {
-                                    "$ref": "#/components/schemas/ProcessStartEvents"
-                                }
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "ProcessImport": {
+            "scriptExecutorsEditable": {
+                "properties": {
+                    "title": {
+                        "description": "Represents an Eloquent model of a Script Executor",
+                        "type": "string"
+                    },
+                    "description": {
+                        "type": "string"
+                    },
+                    "language": {
+                        "type": "string"
+                    },
+                    "config": {
+                        "type": "string"
+                    },
+                    "is_system": {
+                        "type": "boolean"
+                    }
+                },
+                "type": "object"
+            },
+            "scriptExecutors": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/ProcessEditable"
+                        "$ref": "#/components/schemas/scriptExecutorsEditable"
                     },
                     {
                         "properties": {
-                            "status": {
-                                "type": "array",
-                                "items": {
-                                    "type": "object"
-                                }
+                            "id": {
+                                "type": "integer",
+                                "format": "id"
                             },
-                            "assignable": {
-                                "type": "array",
-                                "items": {
-                                    "type": "object"
-                                }
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
                             },
-                            "process": {}
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "ProcessAssignments": {
+            "availableLanguages": {
                 "properties": {
-                    "assignable": {
+                    "text": {
+                        "type": "string"
+                    },
+                    "value": {
+                        "type": "string"
+                    },
+                    "initDockerFile": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "securityLog": {
+                "properties": {
+                    "id": {
+                        "description": "Class SecurityLog",
+                        "type": "integer"
+                    },
+                    "event": {
+                        "type": "string"
+                    },
+                    "ip": {
+                        "type": "string"
+                    },
+                    "meta": {
                         "type": "array",
                         "items": {
+                            "properties": {
+                                "os": {
+                                    "type": "array",
+                                    "items": {
+                                        "properties": {
+                                            "name": {
+                                                "type": "string"
+                                            },
+                                            "version": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "type": "object"
+                                    }
+                                },
+                                "browser": {
+                                    "type": "array",
+                                    "items": {
+                                        "properties": {
+                                            "name": {
+                                                "type": "string"
+                                            },
+                                            "version": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "type": "object"
+                                    }
+                                },
+                                "user_agent": {
+                                    "type": "string"
+                                }
+                            },
                             "type": "object"
                         }
                     },
-                    "cancel_request": {
-                        "type": "object"
+                    "user_id": {
+                        "type": "integer"
                     },
-                    "edit_data": {
-                        "type": "object"
+                    "occured_at": {
+                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "ProcessCategoryEditable": {
+            "settingsEditable": {
                 "properties": {
+                    "key": {
+                        "description": "Class Settings",
+                        "type": "string"
+                    },
+                    "config": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
+                    },
                     "name": {
-                        "description": "Represents a business process category definition.",
                         "type": "string"
                     },
-                    "status": {
-                        "type": "string",
-                        "enum": [
-                            "ACTIVE",
-                            "INACTIVE"
-                        ]
+                    "helper": {
+                        "type": "string"
+                    },
+                    "group": {
+                        "type": "string"
+                    },
+                    "format": {
+                        "type": "string"
+                    },
+                    "hidden": {
+                        "type": "boolean"
+                    },
+                    "readonly": {
+                        "type": "boolean"
+                    },
+                    "variables": {
+                        "type": "string"
+                    },
+                    "sansSerifFont": {
+                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "ProcessCategory": {
+            "settings": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/ProcessCategoryEditable"
+                        "$ref": "#/components/schemas/settingsEditable"
                     },
                     {
                         "properties": {
@@ -7071,125 +10606,166 @@
                     }
                 ]
             },
-            "processPermissionsEditable": {
+            "TokenClient": {
                 "properties": {
                     "id": {
-                        "description": "Represents a Process permission.",
-                        "type": "integer",
-                        "format": "id"
+                        "type": "integer"
                     },
-                    "process_id": {
-                        "type": "integer",
-                        "format": "id"
+                    "user_id": {
+                        "type": "integer"
                     },
-                    "permission_id": {
-                        "type": "integer",
-                        "format": "id"
+                    "name": {
+                        "type": "string"
                     },
-                    "assignable_id": {
-                        "type": "integer",
-                        "format": "id"
+                    "provider": {
+                        "type": "string"
                     },
-                    "assignable_type": {
+                    "redirect": {
                         "type": "string"
+                    },
+                    "personal_access_client": {
+                        "type": "boolean"
+                    },
+                    "password_client": {
+                        "type": "boolean"
+                    },
+                    "revoked": {
+                        "type": "boolean"
+                    },
+                    "created_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "updated_at": {
+                        "type": "string",
+                        "format": "date-time"
                     }
                 },
                 "type": "object"
             },
-            "processPermissions": {
-                "type": "object",
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/processPermissionsEditable"
-                    },
-                    {
-                        "properties": {
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "processRequestEditable": {
+            "usersEditable": {
                 "properties": {
-                    "user_id": {
-                        "description": "Represents an Eloquent model of a Request which is an instance of a Process.",
+                    "email": {
+                        "description": "The attributes that are mass assignable.",
                         "type": "string",
-                        "format": "id"
+                        "format": "email"
+                    },
+                    "firstname": {
+                        "type": "string"
+                    },
+                    "lastname": {
+                        "type": "string"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "password": {
+                        "type": "string"
+                    },
+                    "address": {
+                        "type": "string"
+                    },
+                    "city": {
+                        "type": "string"
+                    },
+                    "state": {
+                        "type": "string"
+                    },
+                    "postal": {
+                        "type": "string"
+                    },
+                    "country": {
+                        "type": "string"
+                    },
+                    "phone": {
+                        "type": "string"
+                    },
+                    "fax": {
+                        "type": "string"
+                    },
+                    "cell": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "timezone": {
+                        "type": "string"
+                    },
+                    "datetime_format": {
+                        "type": "string"
+                    },
+                    "language": {
+                        "type": "string"
+                    },
+                    "is_administrator": {
+                        "type": "boolean"
+                    },
+                    "expires_at": {
+                        "type": "string"
                     },
-                    "callable_id": {
-                        "type": "string",
-                        "format": "id"
+                    "loggedin_at": {
+                        "type": "string"
                     },
-                    "data": {
-                        "type": "object"
+                    "remember_token": {
+                        "type": "string"
                     },
                     "status": {
                         "type": "string",
                         "enum": [
                             "ACTIVE",
-                            "COMPLETED",
-                            "ERROR",
-                            "CANCELED"
+                            "INACTIVE",
+                            "SCHEDULED",
+                            "OUT_OF_OFFICE",
+                            "BLOCKED"
                         ]
                     },
-                    "name": {
+                    "fullname": {
                         "type": "string"
                     },
-                    "case_title": {
+                    "avatar": {
                         "type": "string"
                     },
-                    "case_title_formatted": {
-                        "type": "string"
+                    "media": {
+                        "type": "array",
+                        "items": {
+                            "$ref": "#/components/schemas/media"
+                        }
                     },
-                    "user_viewed_at": {
-                        "type": "string"
+                    "birthdate": {
+                        "type": "string",
+                        "format": "date"
                     },
-                    "case_number": {
-                        "type": "integer"
+                    "delegation_user_id": {
+                        "type": "string",
+                        "format": "id"
                     },
-                    "process_id": {
-                        "type": "integer"
+                    "manager_id": {
+                        "type": "string",
+                        "format": "id"
                     },
-                    "process": {
-                        "type": "object"
+                    "meta": {
+                        "type": "object",
+                        "additionalProperties": true
+                    },
+                    "force_change_password": {
+                        "type": "boolean"
+                    },
+                    "email_task_notification": {
+                        "type": "boolean"
                     }
                 },
                 "type": "object"
             },
-            "processRequest": {
+            "users": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/processRequestEditable"
+                        "$ref": "#/components/schemas/usersEditable"
                     },
                     {
                         "properties": {
                             "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "process_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "process_collaboration_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "participant_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "process_category_id": {
-                                "type": "string",
-                                "format": "id"
+                                "type": "integer"
                             },
                             "created_at": {
                                 "type": "string",
@@ -7199,81 +10775,97 @@
                                 "type": "string",
                                 "format": "date-time"
                             },
-                            "user": {},
-                            "participants": {
-                                "type": "array",
-                                "items": {
-                                    "$ref": "#/components/schemas/users"
-                                }
+                            "deleted_at": {
+                                "type": "string",
+                                "format": "date-time"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "processRequestTokenEditable": {
+            "UserToken": {
                 "properties": {
+                    "id": {
+                        "type": "string"
+                    },
                     "user_id": {
-                        "description": "ProcessRequestToken is used to store the state of a token of the\nNayra engine",
-                        "type": "string",
-                        "format": "id"
+                        "type": "integer"
                     },
-                    "status": {
+                    "client_id": {
+                        "type": "integer"
+                    },
+                    "name": {
                         "type": "string"
                     },
-                    "due_at": {
+                    "scopes": {
+                        "type": "object"
+                    },
+                    "revoked": {
+                        "type": "boolean"
+                    },
+                    "client": {
+                        "$ref": "#/components/schemas/TokenClient"
+                    },
+                    "created_at": {
                         "type": "string",
                         "format": "date-time"
                     },
-                    "initiated_at": {
+                    "updated_at": {
                         "type": "string",
                         "format": "date-time"
                     },
-                    "riskchanges_at": {
+                    "expires_at": {
                         "type": "string",
                         "format": "date-time"
+                    }
+                },
+                "type": "object"
+            },
+            "collectionsEditable": {
+                "properties": {
+                    "name": {
+                        "type": "string"
                     },
-                    "subprocess_start_event_id": {
+                    "description": {
                         "type": "string"
                     },
-                    "data": {
-                        "type": "object"
+                    "custom_title": {
+                        "type": "string"
+                    },
+                    "create_screen_id": {
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "read_screen_id": {
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "update_screen_id": {
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "signal_create": {
+                        "type": "boolean"
+                    },
+                    "signal_update": {
+                        "type": "boolean"
+                    },
+                    "signal_delete": {
+                        "type": "boolean"
                     }
                 },
                 "type": "object"
             },
-            "processRequestToken": {
+            "collections": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/processRequestTokenEditable"
+                        "$ref": "#/components/schemas/collectionsEditable"
                     },
                     {
                         "properties": {
                             "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "process_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "process_request_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "element_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "element_type": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "element_index": {
-                                "type": "string"
-                            },
-                            "element_name": {
-                                "type": "string"
+                                "type": "integer"
                             },
                             "created_at": {
                                 "type": "string",
@@ -7283,130 +10875,141 @@
                                 "type": "string",
                                 "format": "date-time"
                             },
-                            "initiated_at": {
+                            "created_by_id": {
                                 "type": "string",
-                                "format": "date-time"
-                            },
-                            "advanceStatus": {
-                                "type": "string"
-                            },
-                            "due_notified": {
-                                "type": "integer"
-                            },
-                            "user": {
-                                "type": "object"
+                                "format": "id"
                             },
-                            "process": {
-                                "type": "object"
+                            "updated_by_id": {
+                                "type": "string",
+                                "format": "id"
                             },
-                            "process_request": {
-                                "type": "object"
+                            "columns": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object"
+                                }
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "taskAssignmentsEditable": {
+            "recordsEditable": {
                 "properties": {
-                    "process_id": {
-                        "description": "Represents a business process task assignment definition.",
-                        "type": "integer",
-                        "format": "id"
-                    },
-                    "process_task_id": {
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "assignment_id": {
-                        "type": "integer",
-                        "format": "id"
-                    },
-                    "assignment_type": {
-                        "type": "string",
-                        "enum": [
-                            "ProcessMaker\\Models\\User",
-                            "ProcessMaker\\Models\\Group"
-                        ]
+                    "data": {
+                        "type": "object"
                     }
                 },
                 "type": "object"
             },
-            "taskAssignments": {
-                "type": "object",
+            "records": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/taskAssignmentsEditable"
+                        "$ref": "#/components/schemas/recordsEditable"
                     },
                     {
                         "properties": {
                             "id": {
-                                "type": "integer",
-                                "format": "id"
-                            },
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
+                                "type": "integer"
                             },
-                            "updated_at": {
+                            "collection_id": {
                                 "type": "string",
-                                "format": "date-time"
+                                "format": "id"
                             }
                         },
                         "type": "object"
                     }
-                ]
+                ]
+            },
+            "DataSourceCallParameters": {
+                "properties": {
+                    "endpoint": {
+                        "type": "string"
+                    },
+                    "dataMapping": {
+                        "type": "array",
+                        "items": {
+                            "properties": {
+                                "key": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "outboundConfig": {
+                        "type": "array",
+                        "items": {
+                            "properties": {
+                                "key": {
+                                    "type": "string"
+                                },
+                                "value": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    }
+                },
+                "type": "object"
+            },
+            "DataSourceResponse": {
+                "properties": {
+                    "status": {
+                        "type": "integer"
+                    },
+                    "response": {
+                        "type": "object"
+                    }
+                },
+                "type": "object"
             },
-            "screensEditable": {
+            "dataSourceEditable": {
                 "properties": {
-                    "title": {
-                        "description": "Class Screen",
-                        "type": "string"
+                    "id": {
+                        "description": "Class DataSource",
+                        "type": "string",
+                        "format": "id"
                     },
-                    "type": {
+                    "name": {
                         "type": "string"
                     },
                     "description": {
                         "type": "string"
                     },
-                    "config": {
-                        "type": "array",
-                        "items": {
-                            "type": "object"
-                        }
+                    "endpoints": {
+                        "type": "string"
                     },
-                    "computed": {
-                        "type": "array",
-                        "items": {
-                            "type": "object"
-                        }
+                    "mappings": {
+                        "type": "string"
                     },
-                    "watchers": {
-                        "type": "array",
-                        "items": {
-                            "type": "object"
-                        }
+                    "authtype": {
+                        "type": "string"
                     },
-                    "custom_css": {
+                    "credentials": {
                         "type": "string"
                     },
-                    "screen_category_id": {
+                    "status": {
+                        "type": "string"
+                    },
+                    "data_source_category_id": {
                         "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "screens": {
+            "dataSource": {
+                "type": "object",
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/screensEditable"
+                        "$ref": "#/components/schemas/dataSourceEditable"
                     },
                     {
                         "properties": {
-                            "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -7420,18 +11023,10 @@
                     }
                 ]
             },
-            "screenExported": {
-                "properties": {
-                    "url": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "ScreenCategoryEditable": {
+            "dataSourceCategoryEditable": {
                 "properties": {
                     "name": {
-                        "description": "Represents a business screen category definition.",
+                        "description": "Represents a business data Source category definition.",
                         "type": "string"
                     },
                     "status": {
@@ -7444,10 +11039,11 @@
                 },
                 "type": "object"
             },
-            "ScreenCategory": {
+            "DataSourceCategory": {
+                "type": "object",
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/ScreenCategoryEditable"
+                        "$ref": "#/components/schemas/dataSourceCategoryEditable"
                     },
                     {
                         "properties": {
@@ -7468,72 +11064,36 @@
                     }
                 ]
             },
-            "ScreenTypeEditable": {
+            "decisionTableEditable": {
                 "properties": {
-                    "name": {
-                        "description": "Represents a business screen Type definition.",
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "ScreenType": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/ScreenTypeEditable"
+                    "id": {
+                        "description": "Class Screen",
+                        "type": "string",
+                        "format": "id"
                     },
-                    {
-                        "properties": {
-                            "id": {
-                                "type": "string",
-                                "format": "id"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "scriptsEditable": {
-                "properties": {
-                    "title": {
-                        "description": "Represents an Eloquent model of a Script",
+                    "name": {
                         "type": "string"
                     },
                     "description": {
                         "type": "string"
                     },
-                    "language": {
-                        "type": "string"
-                    },
-                    "code": {
+                    "definition": {
                         "type": "string"
                     },
-                    "timeout": {
-                        "type": "integer"
-                    },
-                    "run_as_user_id": {
-                        "type": "integer"
-                    },
-                    "key": {
+                    "decision_table_categories_id": {
                         "type": "string"
-                    },
-                    "script_category_id": {
-                        "type": "integer"
                     }
                 },
                 "type": "object"
             },
-            "scripts": {
+            "decisionTable": {
+                "type": "object",
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/scriptsEditable"
+                        "$ref": "#/components/schemas/decisionTableEditable"
                     },
                     {
                         "properties": {
-                            "id": {
-                                "type": "integer",
-                                "format": "id"
-                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -7547,24 +11107,18 @@
                     }
                 ]
             },
-            "scriptsPreview": {
+            "DecisionTableExported": {
                 "properties": {
-                    "status": {
-                        "type": "string"
-                    },
-                    "key": {
+                    "url": {
                         "type": "string"
-                    },
-                    "output": {
-                        "type": "object"
                     }
                 },
                 "type": "object"
             },
-            "ScriptCategoryEditable": {
+            "decisionTableCategoryEditable": {
                 "properties": {
                     "name": {
-                        "description": "Represents a business script category definition.",
+                        "description": "Represents a business decision Table category definition.",
                         "type": "string"
                     },
                     "status": {
@@ -7577,10 +11131,11 @@
                 },
                 "type": "object"
             },
-            "ScriptCategory": {
+            "DecisionTableCategory": {
+                "type": "object",
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/ScriptCategoryEditable"
+                        "$ref": "#/components/schemas/decisionTableCategoryEditable"
                     },
                     {
                         "properties": {
@@ -7601,36 +11156,43 @@
                     }
                 ]
             },
-            "scriptExecutorsEditable": {
+            "SavedSearchEditable": {
                 "properties": {
-                    "title": {
-                        "description": "Represents an Eloquent model of a Script Executor",
-                        "type": "string"
+                    "meta": {
+                        "description": "Represents an Eloquent model of a Saved Search.",
+                        "type": "object",
+                        "additionalProperties": "true"
                     },
-                    "description": {
+                    "pmql": {
                         "type": "string"
                     },
-                    "language": {
+                    "title": {
                         "type": "string"
                     },
-                    "config": {
-                        "type": "string"
+                    "type": {
+                        "type": "string",
+                        "enum": [
+                            "task",
+                            "request"
+                        ]
                     },
-                    "is_system": {
-                        "type": "boolean"
+                    "advanced_filter": {
+                        "type": "object",
+                        "additionalProperties": "true"
                     }
                 },
                 "type": "object"
             },
-            "scriptExecutors": {
+            "SavedSearch": {
                 "allOf": [
-                    {
-                        "$ref": "#/components/schemas/scriptExecutorsEditable"
-                    },
                     {
                         "properties": {
                             "id": {
-                                "type": "integer",
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "user_id": {
+                                "type": "string",
                                 "format": "id"
                             },
                             "created_at": {
@@ -7643,133 +11205,65 @@
                             }
                         },
                         "type": "object"
+                    },
+                    {
+                        "$ref": "#/components/schemas/SavedSearchEditable"
                     }
                 ]
             },
-            "availableLanguages": {
+            "SavedSearchIcon": {
                 "properties": {
-                    "text": {
+                    "name": {
                         "type": "string"
                     },
                     "value": {
                         "type": "string"
-                    },
-                    "initDockerFile": {
-                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "securityLog": {
+            "SavedSearchChartEditable": {
                 "properties": {
-                    "id": {
-                        "description": "Class SecurityLog",
-                        "type": "integer"
-                    },
-                    "event": {
-                        "type": "string"
-                    },
-                    "ip": {
+                    "title": {
+                        "description": "Represents an Eloquent model of a Saved Search Chart.",
                         "type": "string"
                     },
-                    "meta": {
-                        "type": "array",
-                        "items": {
-                            "properties": {
-                                "os": {
-                                    "type": "array",
-                                    "items": {
-                                        "properties": {
-                                            "name": {
-                                                "type": "string"
-                                            },
-                                            "version": {
-                                                "type": "string"
-                                            }
-                                        },
-                                        "type": "object"
-                                    }
-                                },
-                                "browser": {
-                                    "type": "array",
-                                    "items": {
-                                        "properties": {
-                                            "name": {
-                                                "type": "string"
-                                            },
-                                            "version": {
-                                                "type": "string"
-                                            }
-                                        },
-                                        "type": "object"
-                                    }
-                                },
-                                "user_agent": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
-                    },
-                    "user_id": {
-                        "type": "integer"
-                    },
-                    "occured_at": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "settingsEditable": {
-                "properties": {
-                    "key": {
-                        "description": "Class Settings",
-                        "type": "string"
+                    "type": {
+                        "type": "string",
+                        "enum": [
+                            "bar",
+                            "bar-vertical",
+                            "line",
+                            "pie",
+                            "doughnut"
+                        ]
                     },
                     "config": {
-                        "type": "array",
-                        "items": {
-                            "type": "object"
-                        }
-                    },
-                    "name": {
-                        "type": "string"
-                    },
-                    "helper": {
-                        "type": "string"
-                    },
-                    "group": {
-                        "type": "string"
-                    },
-                    "format": {
-                        "type": "string"
-                    },
-                    "hidden": {
-                        "type": "boolean"
-                    },
-                    "readonly": {
-                        "type": "boolean"
-                    },
-                    "variables": {
-                        "type": "string"
+                        "type": "object",
+                        "additionalProperties": "true"
                     },
-                    "sansSerifFont": {
-                        "type": "string"
+                    "sort": {
+                        "type": "integer"
                     }
                 },
                 "type": "object"
             },
-            "settings": {
+            "SavedSearchChart": {
                 "allOf": [
-                    {
-                        "$ref": "#/components/schemas/settingsEditable"
-                    },
                     {
                         "properties": {
                             "id": {
                                 "type": "string",
                                 "format": "id"
                             },
+                            "saved_search_id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "user_id": {
+                                "type": "string",
+                                "format": "id"
+                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -7777,227 +11271,133 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
+                            },
+                            "deleted_at": {
+                                "type": "string",
+                                "format": "date-time"
                             }
                         },
                         "type": "object"
-                    }
-                ]
-            },
-            "TokenClient": {
-                "properties": {
-                    "id": {
-                        "type": "integer"
-                    },
-                    "user_id": {
-                        "type": "integer"
-                    },
-                    "name": {
-                        "type": "string"
-                    },
-                    "provider": {
-                        "type": "string"
-                    },
-                    "redirect": {
-                        "type": "string"
-                    },
-                    "personal_access_client": {
-                        "type": "boolean"
-                    },
-                    "password_client": {
-                        "type": "boolean"
-                    },
-                    "revoked": {
-                        "type": "boolean"
-                    },
-                    "created_at": {
-                        "type": "string",
-                        "format": "date-time"
                     },
-                    "updated_at": {
-                        "type": "string",
-                        "format": "date-time"
+                    {
+                        "$ref": "#/components/schemas/SavedSearchChartEditable"
                     }
-                },
-                "type": "object"
+                ]
             },
-            "usersEditable": {
+            "ReportEditable": {
                 "properties": {
-                    "email": {
-                        "description": "The attributes that are mass assignable.",
+                    "type": {
                         "type": "string",
-                        "format": "email"
-                    },
-                    "firstname": {
-                        "type": "string"
-                    },
-                    "lastname": {
-                        "type": "string"
-                    },
-                    "username": {
-                        "type": "string"
-                    },
-                    "password": {
-                        "type": "string"
-                    },
-                    "address": {
-                        "type": "string"
-                    },
-                    "city": {
-                        "type": "string"
-                    },
-                    "state": {
-                        "type": "string"
-                    },
-                    "postal": {
-                        "type": "string"
-                    },
-                    "country": {
-                        "type": "string"
-                    },
-                    "phone": {
-                        "type": "string"
-                    },
-                    "fax": {
-                        "type": "string"
-                    },
-                    "cell": {
-                        "type": "string"
-                    },
-                    "title": {
-                        "type": "string"
-                    },
-                    "timezone": {
-                        "type": "string"
-                    },
-                    "datetime_format": {
-                        "type": "string"
-                    },
-                    "language": {
-                        "type": "string"
-                    },
-                    "is_administrator": {
-                        "type": "boolean"
-                    },
-                    "expires_at": {
-                        "type": "string"
-                    },
-                    "loggedin_at": {
-                        "type": "string"
-                    },
-                    "remember_token": {
-                        "type": "string"
+                        "enum": [
+                            "adhoc",
+                            "scheduled"
+                        ]
                     },
-                    "status": {
+                    "format": {
                         "type": "string",
                         "enum": [
-                            "ACTIVE",
-                            "INACTIVE",
-                            "SCHEDULED",
-                            "OUT_OF_OFFICE",
-                            "BLOCKED"
+                            "csv",
+                            "xlsx"
                         ]
                     },
-                    "fullname": {
-                        "type": "string"
+                    "saved_search_id": {
+                        "type": "integer"
                     },
-                    "avatar": {
-                        "type": "string"
+                    "config": {
+                        "type": "object",
+                        "additionalProperties": "true"
                     },
-                    "media": {
+                    "to": {
                         "type": "array",
                         "items": {
-                            "$ref": "#/components/schemas/media"
+                            "type": "string"
                         }
                     },
-                    "birthdate": {
-                        "type": "string",
-                        "format": "date"
-                    },
-                    "delegation_user_id": {
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "manager_id": {
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "meta": {
-                        "type": "object",
-                        "additionalProperties": true
-                    },
-                    "force_change_password": {
-                        "type": "boolean"
+                    "subject": {
+                        "type": "string"
                     },
-                    "email_task_notification": {
-                        "type": "boolean"
+                    "body": {
+                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "users": {
+            "Report": {
                 "allOf": [
-                    {
-                        "$ref": "#/components/schemas/usersEditable"
-                    },
                     {
                         "properties": {
                             "id": {
-                                "type": "integer"
+                                "type": "string",
+                                "format": "id"
                             },
-                            "created_at": {
+                            "user_id": {
                                 "type": "string",
-                                "format": "date-time"
+                                "format": "id"
                             },
-                            "updated_at": {
+                            "created_at": {
                                 "type": "string",
                                 "format": "date-time"
                             },
-                            "deleted_at": {
+                            "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
                             }
                         },
                         "type": "object"
+                    },
+                    {
+                        "$ref": "#/components/schemas/SavedSearchEditable"
                     }
                 ]
             },
-            "UserToken": {
+            "versionHistoryEditable": {
                 "properties": {
-                    "id": {
-                        "type": "string"
-                    },
-                    "user_id": {
+                    "versionable_id": {
+                        "description": "Class VersionHistoryCollection",
                         "type": "integer"
                     },
-                    "client_id": {
-                        "type": "integer"
+                    "versionable_type": {
+                        "type": "string"
                     },
                     "name": {
                         "type": "string"
                     },
-                    "scopes": {
-                        "type": "object"
-                    },
-                    "revoked": {
-                        "type": "boolean"
-                    },
-                    "client": {
-                        "$ref": "#/components/schemas/TokenClient"
-                    },
-                    "created_at": {
-                        "type": "string",
-                        "format": "date-time"
+                    "subject": {
+                        "type": "string"
                     },
-                    "updated_at": {
-                        "type": "string",
-                        "format": "date-time"
+                    "description": {
+                        "type": "string"
                     },
-                    "expires_at": {
+                    "status": {
                         "type": "string",
-                        "format": "date-time"
+                        "enum": [
+                            "ACTIVE",
+                            "INACTIVE"
+                        ]
                     }
                 },
                 "type": "object"
+            },
+            "versionHistory": {
+                "type": "object",
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/versionHistoryEditable"
+                    },
+                    {
+                        "properties": {
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
             }
         },
         "responses": {
@@ -8236,6 +11636,46 @@
         {
             "name": "Processes Variables",
             "description": "Processes Variables"
+        },
+        {
+            "name": "Collections",
+            "description": "Collections"
+        },
+        {
+            "name": "Comments",
+            "description": "Comments"
+        },
+        {
+            "name": "DataSourcesCategories",
+            "description": "DataSourcesCategories"
+        },
+        {
+            "name": "DataSources",
+            "description": "DataSources"
+        },
+        {
+            "name": "DecisionTableCategories",
+            "description": "DecisionTableCategories"
+        },
+        {
+            "name": "DecisionTables",
+            "description": "DecisionTables"
+        },
+        {
+            "name": "SavedSearchCharts",
+            "description": "SavedSearchCharts"
+        },
+        {
+            "name": "SavedSearches",
+            "description": "SavedSearches"
+        },
+        {
+            "name": "Reports",
+            "description": "Reports"
+        },
+        {
+            "name": "Version History",
+            "description": "Version History"
         }
     ],
     "security": [
diff --git a/tests/Feature/Api/WizardTemplatesTest.php b/tests/Feature/Api/WizardTemplatesTest.php
deleted file mode 100644
index 38e2abcd5e..0000000000
--- a/tests/Feature/Api/WizardTemplatesTest.php
+++ /dev/null
@@ -1,61 +0,0 @@
-<?php
-
-namespace Tests\Feature\Api;
-
-use Illuminate\Http\UploadedFile;
-use Illuminate\Support\Facades\Storage;
-use ProcessMaker\Models\WizardTemplate;
-use Tests\Feature\Shared\RequestHelper;
-use Tests\TestCase;
-
-class WizardTemplatesTest extends TestCase
-{
-    use RequestHelper;
-
-    public function testGetWizardTemplates()
-    {
-        $total = 20;
-        WizardTemplate::factory()->count($total)->create();
-
-        $params = [
-            'order_by' => 'id',
-            'order_direction' => 'asc',
-            'per_page' => 10,
-        ];
-        $route = route('api.wizard-templates.index', $params);
-        $response = $this->apiCall('GET', $route);
-
-        $response->assertStatus(200);
-        $response->assertJsonCount(10, 'data');
-        $response->assertJson([
-            'meta' => [
-                'per_page' => $params['per_page'],
-                'total' => $total,
-            ],
-        ]);
-    }
-
-    public function testItCanAddFilesFromUrlToMediaCollection()
-    {
-        // Create fake files.
-        Storage::fake('public');
-        $directoryName = 'images';
-        $filesToCreate = 3;
-        for ($i = 0; $i < $filesToCreate; $i++) {
-            UploadedFile::fake()->image("test_image{$i}.jpg")->storeAs($directoryName, "test_image{$i}.jpg", 'public');
-        }
-
-        // Add files to media collection.
-        $directory = Storage::disk('public')->path($directoryName);
-        $wizardTemplate = WizardTemplate::factory()->create();
-        $wizardTemplate->addFilesToMediaCollection($directory);
-
-        $this->assertCount($filesToCreate, $wizardTemplate->getMedia($directoryName));
-        $this->assertDatabaseHas('media', [
-            'model_type' => WizardTemplate::class,
-            'model_id' => $wizardTemplate->id,
-            'collection_name' => $directoryName,
-            'name' => 'test_image0',
-        ]);
-    }
-}

From 8c8295a24058d82b4c0d0777ca47173bb075918f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?=
 <contact@julio-laura.com>
Date: Mon, 27 Jul 2026 15:13:28 -0400
Subject: [PATCH 29/52] FOUR-31416 Remove guided templates

---
 ProcessMaker/Events/ProcessCompleted.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ProcessMaker/Events/ProcessCompleted.php b/ProcessMaker/Events/ProcessCompleted.php
index be95f14dae..566fd59730 100644
--- a/ProcessMaker/Events/ProcessCompleted.php
+++ b/ProcessMaker/Events/ProcessCompleted.php
@@ -28,7 +28,10 @@ public function __construct(ProcessRequest $processRequest)
     {
         $this->payloadUrl = route('api.requests.show', ['request' => $processRequest->getKey()]);
         $this->processRequest = $processRequest;
-        $this->endEventDestination = $processRequest->getElementDestination();
+
+        if ($processRequest->process->asset_type !== 'GUIDED_HELPER_PROCESS') {
+            $this->endEventDestination = $processRequest->getElementDestination();
+        }
     }
 
     /**

From 5705c021a47981f687c7f6cce1195b4abef6f91c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julio=20Cesar=20Laura=20Avenda=C3=B1o?=
 <contact@julio-laura.com>
Date: Mon, 27 Jul 2026 16:03:51 -0400
Subject: [PATCH 30/52] FOUR-31416 Remove guided templates

---
 .../components/ProcessHeader.vue              |  225 +
 storage/api-docs/api-docs.json                | 5822 ++++-------------
 2 files changed, 1416 insertions(+), 4631 deletions(-)
 create mode 100644 resources/js/processes-catalogue/components/ProcessHeader.vue

diff --git a/resources/js/processes-catalogue/components/ProcessHeader.vue b/resources/js/processes-catalogue/components/ProcessHeader.vue
new file mode 100644
index 0000000000..da85136b7e
--- /dev/null
+++ b/resources/js/processes-catalogue/components/ProcessHeader.vue
@@ -0,0 +1,225 @@
+<template>
+  <div>
+    <div class="header-mobile">
+      <div class="title">
+        {{ process.name }}
+      </div>
+      <div class="start-button">
+        <buttons-start
+          :process="process"
+          :title="$t('Start')"
+          :startEvent="singleStartEvent"
+          :processEvents="processEvents"
+        />
+      </div>
+    </div>
+    <div
+      class="header card-body card-process-info clickable"
+      :style="{
+        borderRadius: infoCollapsed ? '8px 8px 0px 0px' : '8px',
+        borderTopLeftRadius: '8px',
+        borderTopRightRadius: '8px',
+      }"
+      data-toggle="collapse"
+      data-target="#collapseProcessInfo"
+      aria-controls="collapseProcessInfo"
+      :aria-expanded="infoCollapsed"
+      @click="toggleInfoCollapsed()"
+    >
+      <div class="d-flex justify-content-between align-items-center">
+        <div class="d-flex align-items-center">
+          <template v-if="infoCollapsed">
+            <i class="fas fa-caret-down pl-2 mr-2 custom-color"></i>
+            <span class="custom-text">
+              {{ $t("Process Info") }}
+            </span>
+          </template>
+          <template v-else>
+            <i class="fas fa-caret-right pl-2 mr-2 custom-color"></i>
+            <span class="custom-text">
+              {{ $t("Process Info") }}
+            </span>
+          </template>
+        </div>
+
+        <div
+          v-if="!hideHeaderOptions"
+          class="d-flex align-items-center"
+        >
+          <div class="card-bookmark mx-2">
+            <bookmark :process="process"></bookmark>
+          </div>
+          <span class="ellipsis-border">
+            <ellipsis-menu
+              v-if="showEllipsis"
+              :actions="processLaunchpadActions"
+              :data="process"
+              :divider="false"
+              :lauchpad="true"
+              variant="none"
+              @navigate="ellipsisNavigate"
+              :isDocumenterInstalled="$root.isDocumenterInstalled"
+              :permission="$root.permission"
+            />
+          </span>
+          <buttons-start
+            :process="process"
+            :startEvent="singleStartEvent"
+            :processEvents="processEvents"
+          />
+        </div>
+        <div
+          v-else
+          class="d-flex align-items-center"
+        >
+          <template v-if="!infoCollapsed">
+            <process-counter
+              :enable-collapse="enableCollapse"
+              @click.native="toggleInfoCollapsed"
+            />
+          </template>
+        </div>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script>
+import ButtonsStart from "./optionsMenu/ButtonsStart.vue";
+import ProcessesMixin from "./mixins/ProcessesMixin";
+import EllipsisMenu from "../../components/shared/EllipsisMenu.vue";
+import ellipsisMenuMixin from "../../components/shared/ellipsisMenuActions";
+import Bookmark from "./Bookmark.vue";
+import ProcessCounter from "./optionsMenu/ProcessCounter.vue";
+
+export default {
+  components: {
+    ButtonsStart,
+    EllipsisMenu,
+    Bookmark,
+    ProcessCounter,
+  },
+  mixins: [ProcessesMixin, ellipsisMenuMixin],
+  props: {
+    process: {
+      type: Object,
+      required: true,
+    },
+    enableCollapse: {
+      type: Boolean,
+      default: true,
+    },
+    hideHeaderOptions: {
+      type: Boolean,
+      default: false,
+    },
+  },
+  data() {
+    return {
+      infoCollapsed: true,
+      processEvents: [],
+      singleStartEvent: null,
+    };
+  },
+  mounted() {
+    this.getStartEvents();
+  },
+  methods: {
+    ellipsisNavigate(action, data) {
+      this.$emit("onProcessNavigate", action, data);
+    },
+    toggleInfoCollapsed() {
+      this.infoCollapsed = !this.infoCollapsed;
+      this.$emit("onProcessInfoCollapsed", this.infoCollapsed);
+    },
+    /**
+     * get start events for dropdown Menu
+     */
+    getStartEvents() {
+      this.processEvents = [];
+      ProcessMaker.apiClient
+        .get(`process_bookmarks/processes/${this.process.id}/start_events`)
+        .then((response) => {
+          this.processEvents = response.data.data;
+          const nonWebEntryStartEvents = this.processEvents.filter(
+            (e) => !("webEntry" in e) || !e.webEntry
+          );
+          if (nonWebEntryStartEvents.length === 1) {
+            this.singleStartEvent = nonWebEntryStartEvents[0].id;
+          }
+        })
+        .catch((err) => {
+          ProcessMaker.alert(err, "danger");
+        });
+    },
+  },
+};
+</script>
+
+<style lang="scss" scoped>
+@import url("./scss/processes.css");
+@import "~styles/variables";
+.header {
+  @media (max-width: $lp-breakpoint) {
+    display: none;
+  }
+}
+
+.header-mobile {
+  display: none;
+  padding: 1em;
+
+  .title {
+    flex: 1;
+    white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    font-size: 22px;
+    letter-spacing: -0.2;
+    color: #4c545c;
+    font-weight: 400;
+  }
+
+  @media (max-width: $lp-breakpoint) {
+    display: flex;
+    flex-direction: row;
+    align-items: center;
+  }
+}
+
+.card-bookmark {
+  float: right;
+  font-size: 20px;
+}
+.card-bookmark:hover {
+  cursor: pointer;
+}
+
+.card-process-info {
+  border-color: #cdddee;
+  border-radius: 8px;
+  background-color: #fff;
+  margin-bottom: 12px;
+  border: 1px solid rgb(205, 221, 238);
+  padding-top: 13px;
+  height: 53px;
+  margin-right: 20px;
+}
+
+.custom-color {
+  color: #4c545c;
+}
+
+.clickable {
+  cursor: pointer;
+}
+
+.custom-text {
+  font-family: 'Open Sans', sans-serif;
+  font-size: 16px;
+  font-weight: 400;
+  line-height: 24px;
+  letter-spacing: -0.02;
+  color: #556271;
+}
+</style>
diff --git a/storage/api-docs/api-docs.json b/storage/api-docs/api-docs.json
index 832f903c0e..3b01de8d45 100644
--- a/storage/api-docs/api-docs.json
+++ b/storage/api-docs/api-docs.json
@@ -4069,10 +4069,16 @@
                             "schema": {
                                 "properties": {
                                     "data": {
-                                        "type": "object"
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object"
+                                        }
                                     },
                                     "config": {
-                                        "type": "object"
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object"
+                                        }
                                     },
                                     "code": {
                                         "type": "string"
@@ -4117,10 +4123,16 @@
                             "schema": {
                                 "properties": {
                                     "data": {
-                                        "type": "object"
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object"
+                                        }
                                     },
                                     "config": {
-                                        "type": "object"
+                                        "type": "array",
+                                        "items": {
+                                            "type": "object"
+                                        }
                                     },
                                     "sync": {
                                         "type": "boolean"
@@ -6040,3980 +6052,412 @@
                 },
                 "servers": [
                     {
-                        "url": "http://localhost/api/1.1",
+                        "url": "http://landlord.test/api/1.1",
                         "description": "API v1.1 Server"
                     }
                 ]
             }
-        },
-        "/collections": {
-            "get": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Returns all collections that the user has access to",
-                "description": "Get a list of Collections.",
-                "operationId": "getCollections",
-                "parameters": [
-                    {
-                        "$ref": "#/components/parameters/filter"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    },
-                    {
-                        "$ref": "#/components/parameters/include"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of collections",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/collections"
-                                            }
-                                        },
-                                        "meta": {
-                                            "$ref": "#/components/schemas/metadata"
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
+        }
+    },
+    "components": {
+        "schemas": {
+            "DateTime": {
+                "properties": {
+                    "date": {
+                        "type": "string"
                     }
-                }
+                },
+                "type": "object"
             },
-            "post": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Save a new collections",
-                "description": "Create a new Collection.",
-                "operationId": "createCollection",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/collectionsEditable"
-                            }
+            "updateUserGroups": {
+                "properties": {
+                    "groups": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer",
+                            "example": 1
                         }
                     }
                 },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/collections"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/collections/{collection_id}": {
-            "get": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Get single collections by ID",
-                "description": "Get a single Collection.",
-                "operationId": "getCollectionById",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of collection to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully found the collections",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/collections"
-                                }
-                            }
-                        }
-                    }
-                }
+                "type": "object"
             },
-            "put": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Update a collection",
-                "description": "Update a Collection.",
-                "operationId": "updateCollection",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of collection to update",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
+            "restoreUser": {
+                "properties": {
+                    "username": {
+                        "description": "Username to restore",
+                        "type": "string"
                     }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/collectionsEditable"
+                },
+                "type": "object"
+            },
+            "Variable": {
+                "properties": {
+                    "id": {
+                        "type": "integer",
+                        "example": 1
+                    },
+                    "process_id": {
+                        "type": "integer",
+                        "example": 1
+                    },
+                    "uuid": {
+                        "type": "string",
+                        "format": "uuid",
+                        "example": "550e8400-e29b-41d4-a716-446655440000"
+                    },
+                    "field": {
+                        "type": "string",
+                        "example": "string",
+                        "enum": [
+                            "string",
+                            "number",
+                            "boolean",
+                            "array"
+                        ]
+                    },
+                    "label": {
+                        "type": "string",
+                        "example": "Variable 1 for Process 1"
+                    },
+                    "name": {
+                        "type": "string",
+                        "example": "var_1_1"
+                    },
+                    "asset": {
+                        "properties": {
+                            "id": {
+                                "type": "string",
+                                "example": "asset_1_1"
+                            },
+                            "type": {
+                                "type": "string",
+                                "example": "sensor",
+                                "enum": [
+                                    "sensor",
+                                    "actuator",
+                                    "controller",
+                                    "device"
+                                ]
+                            },
+                            "name": {
+                                "type": "string",
+                                "example": "Asset 1 for Process 1"
+                            },
+                            "uuid": {
+                                "type": "string",
+                                "format": "uuid",
+                                "example": "550e8400-e29b-41d4-a716-446655440000"
                             }
-                        }
+                        },
+                        "type": "object"
+                    },
+                    "created_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "updated_at": {
+                        "type": "string",
+                        "format": "date-time"
                     }
                 },
-                "responses": {
-                    "204": {
-                        "description": "success"
-                    }
-                }
+                "type": "object"
             },
-            "delete": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Delete a collection",
-                "description": "Delete a Collection.",
-                "operationId": "deleteCollection",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of collection to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "success"
-                    }
-                }
-            }
-        },
-        "/collections/{collection_id}/export": {
-            "post": {
-                "tags": [
-                    "Screens"
-                ],
-                "summary": "Trigger export collections job",
-                "description": "Export the specified collection.",
-                "operationId": "exportCollection",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of the collection to export",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "202": {
-                        "description": "success"
-                    }
-                }
-            }
-        },
-        "/collections/import": {
-            "post": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Import a new collection",
-                "description": "Import the specified collection.",
-                "operationId": "importCollection",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "multipart/form-data": {
-                            "schema": {
-                                "required": [
-                                    "file"
-                                ],
-                                "properties": {
-                                    "file": {
-                                        "description": "file to upload",
-                                        "type": "file",
-                                        "format": "file"
-                                    }
-                                },
-                                "type": "object"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/collections"
-                                }
-                            }
-                        }
-                    },
-                    "200": {
-                        "description": "success"
-                    }
-                }
-            }
-        },
-        "/collections/{collection_id}/truncate": {
-            "delete": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Deletes all records in a collection",
-                "description": "Truncate a Collection.",
-                "operationId": "truncateCollection",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of collection to truncate",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "success"
-                    }
-                }
-            }
-        },
-        "/collections/{collection_id}/records": {
-            "get": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Returns paginated collection records",
-                "description": "Get the list of records of a collection.",
-                "operationId": "getRecords",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of collection to get records for",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "pmql",
-                        "in": "query",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "per_page",
-                        "in": "query",
-                        "description": "Number of records to return per page. Defaults to 10,000 when omitted, invalid, or non-positive.",
-                        "schema": {
-                            "type": "integer",
-                            "default": 10000
-                        }
-                    },
-                    {
-                        "$ref": "#/components/parameters/filter"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/include"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of records of a collection",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/records"
-                                            }
-                                        },
-                                        "meta": {
-                                            "$ref": "#/components/schemas/metadata"
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "post": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Save a new record in a collection",
-                "description": "Create a new record in a Collection.",
-                "operationId": "createRecord",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of the collection",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/recordsEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/records"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/collections/{collection_id}/records/{record_id}": {
-            "get": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Get single record of a collection",
-                "description": "Get a single record of a Collection.",
-                "operationId": "getRecordById",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of the collection",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "record_id",
-                        "in": "path",
-                        "description": "ID of the record to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully found the record",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/records"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Update a record",
-                "description": "Update a record in a Collection.",
-                "operationId": "updateRecord",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of collection",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "record_id",
-                        "in": "path",
-                        "description": "ID of the record ",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/recordsEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "204": {
-                        "description": "success"
-                    }
-                }
-            },
-            "delete": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Delete a collection record",
-                "description": "Delete a record of a Collection.",
-                "operationId": "deleteRecord",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of collection",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "record_id",
-                        "in": "path",
-                        "description": "ID of record in collection",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "success"
-                    }
-                }
-            },
-            "patch": {
-                "tags": [
-                    "Collections"
-                ],
-                "summary": "Partial update of a record",
-                "description": "Implements a partial update of a record in a Collection.",
-                "operationId": "patchRecord",
-                "parameters": [
-                    {
-                        "name": "collection_id",
-                        "in": "path",
-                        "description": "ID of collection ",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "record_id",
-                        "in": "path",
-                        "description": "ID of the record ",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/collectionsEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "200": {
-                        "description": "success"
-                    }
-                }
-            }
-        },
-        "/comments/tasks": {
-            "get": {
-                "tags": [
-                    "Comments"
-                ],
-                "summary": "Returns all the tasks that are active.",
-                "description": "Display a listing of the resource.",
-                "operationId": "getCommentTasks",
-                "parameters": [
-                    {
-                        "name": "process_request_id",
-                        "in": "query",
-                        "description": "Process request id",
-                        "required": false,
-                        "schema": {
-                            "type": "integer"
-                        }
-                    },
-                    {
-                        "$ref": "#/components/parameters/filter"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list all tasks taht are active",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/processRequestToken"
-                                            }
-                                        },
-                                        "meta": {
-                                            "$ref": "#/components/schemas/metadata"
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/data_source_categories": {
-            "get": {
-                "tags": [
-                    "DataSourcesCategories"
-                ],
-                "summary": "Returns all Data Connectors categories that the user has access to",
-                "description": "Display a listing of the Data Connector Categories.",
-                "operationId": "getDataSourceCategories",
-                "parameters": [
-                    {
-                        "$ref": "#/components/parameters/filter"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of Data Connectors categories",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/DataSourceCategory"
-                                            }
-                                        },
-                                        "meta": {
-                                            "type": "object",
-                                            "allOf": [
-                                                {
-                                                    "$ref": "#/components/schemas/metadata"
-                                                }
-                                            ]
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "post": {
-                "tags": [
-                    "DataSourcesCategories"
-                ],
-                "summary": "Save a new Data Connector Category",
-                "description": "Store a newly created Data Connector Category in storage",
-                "operationId": "createDataSourceCategory",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/dataSourceCategoryEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/DataSourceCategory"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/data_source_categories/{data_source_category_id}": {
-            "get": {
-                "tags": [
-                    "DataSourcesCategories"
-                ],
-                "summary": "Get single Data Connector category by ID",
-                "description": "Display the specified data Source category.",
-                "operationId": "getDatasourceCategoryById",
-                "parameters": [
-                    {
-                        "name": "data_source_category_id",
-                        "in": "path",
-                        "description": "ID of Data Connector category to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully found the Data Connector",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/DataSourceCategory"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "DataSourcesCategories"
-                ],
-                "summary": "Update a Data Connector Category",
-                "description": "Updates the current element",
-                "operationId": "updateDatasourceCategory",
-                "parameters": [
-                    {
-                        "name": "data_source_category_id",
-                        "in": "path",
-                        "description": "ID of Data Connector category to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/dataSourceCategoryEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "200": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/DataSourceCategory"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "tags": [
-                    "DataSourcesCategories"
-                ],
-                "summary": "Delete a Data Connector category",
-                "description": "Remove the specified resource from storage.",
-                "operationId": "deleteDataSourceCategory",
-                "parameters": [
-                    {
-                        "name": "data_source_category_id",
-                        "in": "path",
-                        "description": "ID of Data Connector category to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "success"
-                    }
-                }
-            }
-        },
-        "/data_sources": {
-            "get": {
-                "tags": [
-                    "DataSources"
-                ],
-                "summary": "Returns all Data Connectors that the user has access to",
-                "description": "Get the list of records of a Data Connector",
-                "operationId": "getDataSources",
-                "parameters": [
-                    {
-                        "$ref": "#/components/parameters/filter"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    },
-                    {
-                        "$ref": "#/components/parameters/include"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of Data Connectors",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/dataSource"
-                                            }
-                                        },
-                                        "meta": {
-                                            "type": "object",
-                                            "allOf": [
-                                                {
-                                                    "$ref": "#/components/schemas/metadata"
-                                                }
-                                            ]
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "post": {
-                "tags": [
-                    "DataSources"
-                ],
-                "summary": "Save a new Data Connector",
-                "description": "Create a new Data Connector.",
-                "operationId": "createDataSource",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/dataSourceEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/dataSource"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/data_sources/{data_source_id}": {
-            "get": {
-                "tags": [
-                    "DataSources"
-                ],
-                "summary": "Get single Data Connector by ID",
-                "description": "Get a single Data Connector.",
-                "operationId": "getDataSourceById",
-                "parameters": [
-                    {
-                        "name": "data_source_id",
-                        "in": "path",
-                        "description": "ID of Data Connector to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully found the Data Connector",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/dataSource"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "DataSources"
-                ],
-                "summary": "Update a Data Connector",
-                "description": "Update a Data Connector.",
-                "operationId": "updateDataSource",
-                "parameters": [
-                    {
-                        "name": "data_source_id",
-                        "in": "path",
-                        "description": "ID of Data Connector to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/dataSourceEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "204": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/dataSource"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "tags": [
-                    "DataSources"
-                ],
-                "summary": "Delete a Data Connector",
-                "description": "Delete a Data Connector.",
-                "operationId": "deleteDataSource",
-                "parameters": [
-                    {
-                        "name": "data_source_id",
-                        "in": "path",
-                        "description": "ID of Data Connector to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/dataSource"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/data_sources/{data_source_id}/test": {
-            "post": {
-                "tags": [
-                    "DataSources"
-                ],
-                "summary": "Send a Data Connector request",
-                "description": "Send a Data Connector request.",
-                "operationId": "sendDataSource",
-                "parameters": [
-                    {
-                        "name": "data_source_id",
-                        "in": "path",
-                        "description": "ID of Data Connector to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/dataSourceEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "204": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/dataSource"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/requests/{request_id}/data_sources/{data_source_id}": {
-            "post": {
-                "tags": [
-                    "DataSources"
-                ],
-                "summary": "execute Data Source",
-                "description": "Execute a data Source endpoint",
-                "operationId": "executeDataSourceForRequest",
-                "parameters": [
-                    {
-                        "name": "request_id",
-                        "in": "path",
-                        "description": "ID of the request in whose context the datasource will be executed",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "data_source_id",
-                        "in": "path",
-                        "description": "ID of DataSource to be run",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "properties": {
-                                    "config": {
-                                        "$ref": "#/components/schemas/DataSourceCallParameters"
-                                    }
-                                },
-                                "type": "object"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "200": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/DataSourceResponse"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/requests/data_sources/{data_source_id}": {
-            "post": {
-                "tags": [
-                    "DataSources"
-                ],
-                "summary": "execute Data Source",
-                "operationId": "executeDataSource",
-                "parameters": [
-                    {
-                        "name": "data_source_id",
-                        "in": "path",
-                        "description": "ID of DataSource to be run",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "properties": {
-                                    "config": {
-                                        "$ref": "#/components/schemas/DataSourceCallParameters"
-                                    },
-                                    "data": {
-                                        "type": "object"
-                                    }
-                                },
-                                "type": "object"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "200": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/DataSourceResponse"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/requests/data_sources/{data_source_id}/resources/{endpoint}/data": {
-            "post": {
-                "tags": [
-                    "DataSources"
-                ],
-                "summary": "Get Data from Data Source",
-                "operationId": "getDataFromDataSource",
-                "parameters": [
-                    {
-                        "name": "data_source_id",
-                        "in": "path",
-                        "description": "ID of DataSource to be run",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "endpoint",
-                        "in": "path",
-                        "description": "Endpoint of the data source",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/DataSourceResponse"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/decision_table_categories": {
-            "get": {
-                "tags": [
-                    "DecisionTableCategories"
-                ],
-                "summary": "Returns all Decision Tables categories that the user has access to",
-                "description": "Display a listing of the Decision Tables Categories.",
-                "operationId": "getDecisionTableCategories",
-                "parameters": [
-                    {
-                        "$ref": "#/components/parameters/filter"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of Decision Tables categories",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/DecisionTableCategory"
-                                            }
-                                        },
-                                        "meta": {
-                                            "type": "object",
-                                            "allOf": [
-                                                {
-                                                    "$ref": "#/components/schemas/metadata"
-                                                }
-                                            ]
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "post": {
-                "tags": [
-                    "DecisionTableCategories"
-                ],
-                "summary": "Save a new Decision Table Category",
-                "description": "Store a newly created Decision Tables  Category in storage",
-                "operationId": "createDecisionTableCategory",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/decisionTableCategoryEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/DecisionTableCategory"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/decision_table_categories/{decision_table_categories_id}": {
-            "get": {
-                "tags": [
-                    "DecisionTableCategories"
-                ],
-                "summary": "Get single Decision Table category by ID",
-                "description": "Display the specified decision Tables category.",
-                "operationId": "getDecisionTableCategoryById",
-                "parameters": [
-                    {
-                        "name": "decision_table_categories_id",
-                        "in": "path",
-                        "description": "ID of Decision Table category to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully found the Decision Table",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/DecisionTableCategory"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "DecisionTableCategories"
-                ],
-                "summary": "Update a Decision Table Category",
-                "description": "Updates the current element",
-                "operationId": "updateDecisionTableCategory",
-                "parameters": [
-                    {
-                        "name": "decision_table_categories_id",
-                        "in": "path",
-                        "description": "ID of Decision Table category to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/decisionTableCategoryEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "200": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/DecisionTableCategory"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "tags": [
-                    "DecisionTableCategories"
-                ],
-                "summary": "Delete a Decision Table category",
-                "description": "Remove the specified resource from storage.",
-                "operationId": "deleteDecisionTableCategory",
-                "parameters": [
-                    {
-                        "name": "decision_table_categories_id",
-                        "in": "path",
-                        "description": "ID of Decision Table category to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "success"
-                    }
-                }
-            }
-        },
-        "/decision_tables": {
-            "get": {
-                "tags": [
-                    "DecisionTables"
-                ],
-                "summary": "Returns all Decision tables that the user has access to",
-                "description": "Display a listing of the resource.",
-                "operationId": "getDecisionTables",
-                "parameters": [
-                    {
-                        "$ref": "#/components/parameters/filter"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    },
-                    {
-                        "$ref": "#/components/parameters/include"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of Decision Tables",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/decisionTable"
-                                            }
-                                        },
-                                        "meta": {
-                                            "type": "object",
-                                            "allOf": [
-                                                {
-                                                    "$ref": "#/components/schemas/metadata"
-                                                }
-                                            ]
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "post": {
-                "tags": [
-                    "DecisionTables"
-                ],
-                "summary": "Save a new Decision Table",
-                "description": "Store a newly created resource in storage.",
-                "operationId": "createDecisionTable",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/decisionTableEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/decisionTable"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/decision_tables/{decision_table_id}": {
-            "get": {
-                "tags": [
-                    "DecisionTables"
-                ],
-                "summary": "Get single Decision Table by ID",
-                "description": "Display the specified resource.",
-                "operationId": "getDecisionTableById",
-                "parameters": [
-                    {
-                        "name": "decision_table_id",
-                        "in": "path",
-                        "description": "ID of Decision Table to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully found the Decision Table",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/decisionTable"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "DecisionTables"
-                ],
-                "summary": "Update a Decision Table",
-                "description": "Update a Decision table",
-                "operationId": "updateDecisionTable",
-                "parameters": [
-                    {
-                        "name": "decision_table_id",
-                        "in": "path",
-                        "description": "ID of Decision Table to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/decisionTableEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "204": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/decisionTable"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "tags": [
-                    "DecisionTables"
-                ],
-                "summary": "Delete a Decision Table",
-                "description": "Delete a Decision tables",
-                "operationId": "deleteDecisionTable",
-                "parameters": [
-                    {
-                        "name": "decision_table_id",
-                        "in": "path",
-                        "description": "ID of Decision Table to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/decisionTable"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/decision_tables/{decision_table_id}/duplicate": {
-            "put": {
-                "tags": [
-                    "DecisionTables"
-                ],
-                "summary": "duplicate a Decision Table",
-                "description": "duplicate a Decision table.",
-                "operationId": "duplicateDecisionTable",
-                "parameters": [
-                    {
-                        "name": "decision_table_id",
-                        "in": "path",
-                        "description": "ID of Decision Table to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/decisionTableEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/decisionTable"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/decision_tables/{decision_table_id}/excel-import": {
-            "post": {
-                "tags": [
-                    "DecisionTables"
-                ],
-                "summary": "Import a new decision table",
-                "description": "Import a Decision table from excel",
-                "operationId": "importExcel",
-                "parameters": [
-                    {
-                        "name": "decision_table_id",
-                        "in": "path",
-                        "description": "ID of Decision Table to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "multipart/form-data": {
-                            "schema": {
-                                "properties": {
-                                    "file": {
-                                        "description": "file to import",
-                                        "type": "string",
-                                        "format": "binary"
-                                    }
-                                },
-                                "type": "object"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "status": {
-                                            "type": "object"
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/decision_tables/{decision_table_id}/export": {
-            "post": {
-                "tags": [
-                    "DecisionTables"
-                ],
-                "summary": "Export a single Decision Table by ID",
-                "description": "Export the specified screen.",
-                "operationId": "exportDecisionTable",
-                "parameters": [
-                    {
-                        "name": "decision_table_id",
-                        "in": "path",
-                        "description": "ID of Decision Table to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully exported the decision table",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/DecisionTableExported"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/decision_tables/import": {
-            "post": {
-                "tags": [
-                    "DecisionTables"
-                ],
-                "summary": "Import a new Decision Table",
-                "description": "Import the specified Decision Table.",
-                "operationId": "importDecisionTable",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "multipart/form-data": {
-                            "schema": {
-                                "properties": {
-                                    "file": {
-                                        "description": "file to import",
-                                        "type": "string",
-                                        "format": "binary"
-                                    }
-                                },
-                                "type": "object"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "status": {
-                                            "type": "object"
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/decision_tables/{decision_table_id}/execute": {
-            "post": {
-                "tags": [
-                    "DecisionTables"
-                ],
-                "summary": "Execute a Decision Table definition",
-                "description": "Execute a Decision Table definition",
-                "operationId": "previewDecisionTable",
-                "parameters": [
-                    {
-                        "name": "decision_table_id",
-                        "in": "path",
-                        "description": "Decision Table unique Identifier",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully executed",
-                        "content": {
-                            "application/json": {
-                                "schema": {}
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/saved-searches/{saved_search_id}/charts": {
-            "get": {
-                "tags": [
-                    "SavedSearchCharts"
-                ],
-                "summary": "Returns all saved search charts that the user has access to",
-                "description": "Get a list of SavedSearchCharts.",
-                "operationId": "getSavedSearchCharts",
-                "parameters": [
-                    {
-                        "$ref": "#/components/parameters/filter"
-                    },
-                    {
-                        "name": "type",
-                        "in": "query",
-                        "description": "Only return saved searches by type",
-                        "required": false,
-                        "schema": {
-                            "type": "string",
-                            "enum": [
-                                "request",
-                                "task",
-                                "collection"
-                            ]
-                        }
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    },
-                    {
-                        "$ref": "#/components/parameters/include"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of saved search charts",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/SavedSearchChart"
-                                            }
-                                        },
-                                        "meta": {
-                                            "type": "object",
-                                            "allOf": [
-                                                {
-                                                    "$ref": "#/components/schemas/metadata"
-                                                }
-                                            ]
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "SavedSearchCharts"
-                ],
-                "summary": "Update several saved search charts at once",
-                "description": "Batch update several SavedSearchCharts.",
-                "operationId": "batchUpdateSavedSearchCharts",
-                "parameters": [
-                    {
-                        "name": "saved_search_id",
-                        "in": "path",
-                        "description": "ID of saved search to which these charts will be saved",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "type": "array",
-                                "items": {
-                                    "$ref": "#/components/schemas/SavedSearchChart"
-                                }
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "204": {
-                        "description": "success"
-                    }
-                }
-            },
-            "post": {
-                "tags": [
-                    "SavedSearchCharts"
-                ],
-                "summary": "Save a new saved search chart",
-                "description": "Create a new SavedSearchChart.",
-                "operationId": "createSavedSearchChart",
-                "parameters": [
-                    {
-                        "name": "saved_search_id",
-                        "in": "path",
-                        "description": "ID of saved search to which this chart will be saved",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/SavedSearchChartEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/SavedSearchChart"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/saved-searches/charts/{chart_id}": {
-            "get": {
-                "tags": [
-                    "SavedSearchCharts"
-                ],
-                "summary": "Get single saved search chart by ID",
-                "description": "Get a single SavedSearchChart.",
-                "operationId": "getSavedSearchChartById",
-                "parameters": [
-                    {
-                        "name": "chart_id",
-                        "in": "path",
-                        "description": "ID of chart to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully found the saved search chart",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/SavedSearchChart"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "SavedSearchCharts"
-                ],
-                "summary": "Update a saved search chart",
-                "description": "Update a SavedSearchChart.",
-                "operationId": "updateSavedSearchChart",
-                "parameters": [
-                    {
-                        "name": "chart_id",
-                        "in": "path",
-                        "description": "ID of chart to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/SavedSearchChartEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "200": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/SavedSearchChart"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "tags": [
-                    "SavedSearchCharts"
-                ],
-                "summary": "Delete a saved search chart",
-                "description": "Delete a SavedSearchChart.",
-                "operationId": "deleteSavedSearchChart",
-                "parameters": [
-                    {
-                        "name": "chart_id",
-                        "in": "path",
-                        "description": "ID of chart to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "success"
-                    }
-                }
-            }
-        },
-        "/saved-searches/charts/{chart_id}/fields": {
-            "get": {
-                "tags": [
-                    "SavedSearchCharts"
-                ],
-                "summary": "Get available chart fields for a Saved Search by ID",
-                "description": "Get available chart fields for a Saved Search.",
-                "operationId": "getSavedSearchFieldsById",
-                "parameters": [
-                    {
-                        "name": "chart_id",
-                        "in": "path",
-                        "description": "ID of Saved Search to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully found the saved search",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/SavedSearch"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/saved-searches/qa/batch-create-requests": {
-            "post": {
-                "tags": [
-                    "SavedSearches"
-                ],
-                "summary": "Batch-create test process requests for saved search testing (QA only)",
-                "description": "Batch-create process requests via the seed-performance Artisan command.",
-                "operationId": "batchCreateRequests",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "required": [
-                                    "cases"
-                                ],
-                                "properties": {
-                                    "cases": {
-                                        "description": "Number of cases to create",
-                                        "type": "integer",
-                                        "example": 1000
-                                    },
-                                    "process_id": {
-                                        "description": "Reuse an existing process ID",
-                                        "type": "integer",
-                                        "nullable": true
-                                    },
-                                    "data_size": {
-                                        "description": "Target payload size in bytes (default 262144 = 256KB)",
-                                        "type": "integer",
-                                        "nullable": true
-                                    },
-                                    "status": {
-                                        "type": "string",
-                                        "default": "ACTIVE",
-                                        "enum": [
-                                            "ACTIVE",
-                                            "COMPLETED",
-                                            "ERROR",
-                                            "CANCELED"
-                                        ]
-                                    }
-                                },
-                                "type": "object"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "Requests created successfully",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "cases": {
-                                            "type": "integer"
-                                        },
-                                        "exit_code": {
-                                            "type": "integer"
-                                        },
-                                        "output": {
-                                            "type": "string"
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    },
-                    "403": {
-                        "description": "QA endpoint is disabled"
-                    },
-                    "422": {
-                        "description": "Command failed"
-                    }
-                }
-            }
-        },
-        "/saved-searches/reports": {
-            "post": {
-                "tags": [
-                    "Reports"
-                ],
-                "summary": "Save a new report",
-                "operationId": "createReport",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/ReportEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/Report"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/saved-searches/reports/{reportId}": {
-            "put": {
-                "tags": [
-                    "SavedSearches"
-                ],
-                "summary": "Update a saved search",
-                "description": "Update a Report",
-                "operationId": "updateReport",
-                "parameters": [
-                    {
-                        "name": "reportId",
-                        "in": "path",
-                        "description": "ID of report",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/SavedSearchEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "200": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/SavedSearch"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/saved-searches": {
-            "get": {
-                "tags": [
-                    "SavedSearches"
-                ],
-                "summary": "Returns all saved searches that the user has access to",
-                "description": "Get a list of SavedSearches.",
-                "operationId": "getSavedSearches",
-                "parameters": [
-                    {
-                        "$ref": "#/components/parameters/filter"
-                    },
-                    {
-                        "name": "type",
-                        "in": "query",
-                        "description": "Only return saved searches by type",
-                        "required": false,
-                        "schema": {
-                            "type": "string",
-                            "enum": [
-                                "request",
-                                "task",
-                                "collection"
-                            ]
-                        }
-                    },
-                    {
-                        "name": "subset",
-                        "in": "query",
-                        "description": "Only return saved searches that are yours or those that have been shared with you",
-                        "required": false,
-                        "schema": {
-                            "type": "string",
-                            "enum": [
-                                "mine",
-                                "shared"
-                            ]
-                        }
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    },
-                    {
-                        "$ref": "#/components/parameters/include"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of saved searches",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/SavedSearch"
-                                            }
-                                        },
-                                        "meta": {
-                                            "type": "object",
-                                            "allOf": [
-                                                {
-                                                    "$ref": "#/components/schemas/metadata"
-                                                }
-                                            ]
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "post": {
-                "tags": [
-                    "SavedSearches"
-                ],
-                "summary": "Save a new saved search",
-                "description": "Create a new SavedSearch.",
-                "operationId": "createSavedSearch",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/SavedSearchEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/SavedSearch"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/saved-searches/{savedSearchId}": {
-            "get": {
-                "tags": [
-                    "SavedSearches"
-                ],
-                "summary": "Get single saved searches by ID",
-                "description": "Get a single SavedSearch.",
-                "operationId": "getSavedSearchById",
-                "parameters": [
-                    {
-                        "name": "savedSearchId",
-                        "in": "path",
-                        "description": "ID of saved search to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully found the saved search",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/SavedSearch"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "SavedSearches"
-                ],
-                "summary": "Update a saved search",
-                "description": "Update a SavedSearch.",
-                "operationId": "updateSavedSearch",
-                "parameters": [
-                    {
-                        "name": "savedSearchId",
-                        "in": "path",
-                        "description": "ID of saved search to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/SavedSearchEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "200": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/SavedSearch"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/saved-searches/{savedSearchId}/columns": {
-            "get": {
-                "tags": [
-                    "SavedSearches"
-                ],
-                "summary": "Returns all columns associated with a Saved Search",
-                "description": "Display a listing of columns.",
-                "operationId": "getSavedSearchColumns",
-                "parameters": [
-                    {
-                        "name": "savedSearchId",
-                        "in": "path",
-                        "description": "ID of saved search to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "include",
-                        "in": "query",
-                        "description": "Include specific categories. Comma separated list.",
-                        "schema": {
-                            "type": "array",
-                            "items": {
-                                "type": "string",
-                                "enum": [
-                                    "current",
-                                    "default",
-                                    "available",
-                                    "data"
-                                ]
-                            },
-                            "uniqueItems": false
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Categorized list of columns",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "current": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/columns"
-                                            }
-                                        },
-                                        "default": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/columns"
-                                            }
-                                        },
-                                        "available": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/columns"
-                                            }
-                                        },
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/columns"
-                                            }
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/saved-searches/{savedSearchId}/users": {
-            "get": {
-                "tags": [
-                    "Users"
-                ],
-                "summary": "Returns all users",
-                "description": "Display a listing of the resource.",
-                "operationId": "getSavedSearchUsers",
-                "parameters": [
-                    {
-                        "name": "savedSearchId",
-                        "in": "path",
-                        "description": "ID of saved search to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "name": "filter",
-                        "in": "query",
-                        "description": "Filter results by string. Searches First Name, Last Name, Email and Username.",
-                        "schema": {
-                            "type": "string"
-                        }
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    },
-                    {
-                        "$ref": "#/components/parameters/include"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of users",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/users"
-                                            }
-                                        },
-                                        "meta": {
-                                            "$ref": "#/components/schemas/metadata"
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/saved-searches/{savedSearchId}/groups": {
-            "get": {
-                "tags": [
-                    "Groups"
-                ],
-                "summary": "Returns all groups that the user has access to",
-                "description": "Display a listing of the resource.",
-                "operationId": "getSavedSearchGroups",
-                "parameters": [
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    },
-                    {
-                        "$ref": "#/components/parameters/include"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of groups",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/groups"
-                                            }
-                                        },
-                                        "meta": {
-                                            "$ref": "#/components/schemas/metadata"
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/saved-searches/{saved_search_id}": {
-            "delete": {
-                "tags": [
-                    "SavedSearches"
-                ],
-                "summary": "Delete a saved search",
-                "description": "Delete a SavedSearch.",
-                "operationId": "deleteSavedSearch",
-                "parameters": [
-                    {
-                        "name": "saved_search_id",
-                        "in": "path",
-                        "description": "ID of saved search to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "success"
-                    }
-                }
-            }
-        },
-        "/saved-searches/icons": {
-            "get": {
-                "tags": [
-                    "SavedSearches"
-                ],
-                "summary": "Returns all icons for saved searches",
-                "description": "Get a list of icons available for SavedSearches.",
-                "operationId": "getSavedSearchesIcons",
-                "parameters": [
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of icons for saved searches",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/SavedSearchIcon"
-                                            }
-                                        },
-                                        "meta": {
-                                            "type": "object",
-                                            "allOf": [
-                                                {
-                                                    "$ref": "#/components/schemas/metadata"
-                                                }
-                                            ]
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/version_histories": {
-            "get": {
-                "tags": [
-                    "Version History"
-                ],
-                "summary": "Return all version History according to the model",
-                "description": "Get the list of records of Version History",
-                "operationId": "getVersionHistories",
-                "parameters": [
-                    {
-                        "$ref": "#/components/parameters/filter"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_by"
-                    },
-                    {
-                        "$ref": "#/components/parameters/order_direction"
-                    },
-                    {
-                        "$ref": "#/components/parameters/per_page"
-                    },
-                    {
-                        "$ref": "#/components/parameters/include"
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "list of Version History",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "properties": {
-                                        "data": {
-                                            "type": "array",
-                                            "items": {
-                                                "$ref": "#/components/schemas/versionHistory"
-                                            }
-                                        },
-                                        "meta": {
-                                            "type": "object",
-                                            "allOf": [
-                                                {
-                                                    "$ref": "#/components/schemas/metadata"
-                                                }
-                                            ]
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "post": {
-                "tags": [
-                    "Version History"
-                ],
-                "summary": "Save a new Version History",
-                "description": "Create a new Version History.",
-                "operationId": "createVersion",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/versionHistoryEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/versionHistory"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/version_histories/{version_history_id}": {
-            "get": {
-                "tags": [
-                    "Version History"
-                ],
-                "summary": "Get single Version History by ID",
-                "description": "Get a single Version History.",
-                "operationId": "getVersionHistoryById",
-                "parameters": [
-                    {
-                        "name": "version_history_id",
-                        "in": "path",
-                        "description": "ID of Version History to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "200": {
-                        "description": "Successfully found the Version History",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/versionHistory"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "put": {
-                "tags": [
-                    "Version History"
-                ],
-                "summary": "Update a Version History",
-                "description": "Update a Version History.",
-                "operationId": "updateVersion",
-                "parameters": [
-                    {
-                        "name": "version_history_id",
-                        "in": "path",
-                        "description": "ID of Version History to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/versionHistoryEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "204": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/versionHistory"
-                                }
-                            }
-                        }
-                    }
-                }
-            },
-            "delete": {
-                "tags": [
-                    "Version History"
-                ],
-                "summary": "Delete a Version History",
-                "description": "Delete a Version History.",
-                "operationId": "deleteVersion",
-                "parameters": [
-                    {
-                        "name": "version_history_id",
-                        "in": "path",
-                        "description": "ID of Version History to return",
-                        "required": true,
-                        "schema": {
-                            "type": "string"
-                        }
-                    }
-                ],
-                "responses": {
-                    "204": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/versionHistory"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        },
-        "/version_histories/clone": {
-            "post": {
-                "tags": [
-                    "Version History"
-                ],
-                "summary": "Clone a new Version History",
-                "description": "Clone a new Version History.",
-                "operationId": "cloneVersion",
-                "requestBody": {
-                    "required": true,
-                    "content": {
-                        "application/json": {
-                            "schema": {
-                                "$ref": "#/components/schemas/versionHistoryEditable"
-                            }
-                        }
-                    }
-                },
-                "responses": {
-                    "201": {
-                        "description": "success",
-                        "content": {
-                            "application/json": {
-                                "schema": {
-                                    "$ref": "#/components/schemas/versionHistory"
-                                }
-                            }
-                        }
-                    }
-                }
-            }
-        }
-    },
-    "components": {
-        "schemas": {
-            "DateTime": {
-                "properties": {
-                    "date": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "updateUserGroups": {
-                "properties": {
-                    "groups": {
-                        "type": "array",
-                        "items": {
-                            "type": "integer",
-                            "example": 1
-                        }
-                    }
-                },
-                "type": "object"
-            },
-            "restoreUser": {
-                "properties": {
-                    "username": {
-                        "description": "Username to restore",
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "Variable": {
-                "properties": {
-                    "id": {
-                        "type": "integer",
-                        "example": 1
-                    },
-                    "process_id": {
-                        "type": "integer",
-                        "example": 1
-                    },
-                    "uuid": {
-                        "type": "string",
-                        "format": "uuid",
-                        "example": "550e8400-e29b-41d4-a716-446655440000"
-                    },
-                    "field": {
-                        "type": "string",
-                        "example": "string",
-                        "enum": [
-                            "string",
-                            "number",
-                            "boolean",
-                            "array"
-                        ]
-                    },
-                    "label": {
-                        "type": "string",
-                        "example": "Variable 1 for Process 1"
-                    },
-                    "name": {
-                        "type": "string",
-                        "example": "var_1_1"
-                    },
-                    "asset": {
-                        "properties": {
-                            "id": {
-                                "type": "string",
-                                "example": "asset_1_1"
-                            },
-                            "type": {
-                                "type": "string",
-                                "example": "sensor",
-                                "enum": [
-                                    "sensor",
-                                    "actuator",
-                                    "controller",
-                                    "device"
-                                ]
-                            },
-                            "name": {
-                                "type": "string",
-                                "example": "Asset 1 for Process 1"
-                            },
-                            "uuid": {
-                                "type": "string",
-                                "format": "uuid",
-                                "example": "550e8400-e29b-41d4-a716-446655440000"
-                            }
-                        },
-                        "type": "object"
-                    },
-                    "created_at": {
-                        "type": "string",
-                        "format": "date-time"
-                    },
-                    "updated_at": {
-                        "type": "string",
-                        "format": "date-time"
-                    }
-                },
-                "type": "object"
-            },
-            "PaginationMeta": {
-                "properties": {
-                    "current_page": {
-                        "type": "integer",
-                        "example": 1
-                    },
-                    "from": {
-                        "type": "integer",
-                        "example": 1
-                    },
-                    "last_page": {
-                        "type": "integer",
-                        "example": 5
-                    },
-                    "path": {
-                        "type": "string",
-                        "example": "http://processmaker.com/processes/variables"
-                    },
-                    "per_page": {
-                        "type": "integer",
-                        "example": 20
-                    },
-                    "to": {
-                        "type": "integer",
-                        "example": 20
-                    },
-                    "total": {
-                        "type": "integer",
-                        "example": 100
-                    },
-                    "links": {
-                        "properties": {
-                            "first": {
-                                "type": "string",
-                                "example": "http://processmaker.com/processes/variables?page=1"
-                            },
-                            "last": {
-                                "type": "string",
-                                "example": "http://processmaker.com/processes/variables?page=5"
-                            },
-                            "prev": {
-                                "type": "string",
-                                "nullable": true
-                            },
-                            "next": {
-                                "type": "string",
-                                "example": "http://processmaker.com/processes/variables?page=2"
-                            }
-                        },
-                        "type": "object"
-                    }
-                },
-                "type": "object"
-            },
-            "metadata": {
-                "properties": {
-                    "filter": {
-                        "type": "string"
-                    },
-                    "sort_by": {
-                        "type": "string"
-                    },
-                    "sort_order": {
-                        "type": "string",
-                        "enum": [
-                            "asc",
-                            "desc"
-                        ]
-                    },
-                    "count": {
-                        "type": "integer"
-                    },
-                    "total_pages": {
-                        "type": "integer"
-                    },
-                    "current_page": {
-                        "type": "integer"
-                    },
-                    "form": {
-                        "type": "integer"
-                    },
-                    "last_page": {
-                        "type": "integer"
-                    },
-                    "path": {
-                        "type": "string"
-                    },
-                    "per_page": {
-                        "type": "integer"
-                    },
-                    "to": {
-                        "type": "integer"
-                    },
-                    "total": {
-                        "type": "integer"
-                    }
-                },
-                "type": "object"
-            },
-            "taskMetadata": {
-                "type": "object",
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/metadata"
-                    },
-                    {
-                        "properties": {
-                            "filter": {
-                                "type": "string"
-                            },
-                            "sort_by": {
-                                "type": "string"
-                            },
-                            "sort_order": {
-                                "type": "string",
-                                "enum": [
-                                    "asc",
-                                    "desc"
-                                ]
-                            },
-                            "count": {
-                                "type": "integer"
-                            },
-                            "total_pages": {
-                                "type": "integer"
-                            },
-                            "current_page": {
-                                "type": "integer"
-                            },
-                            "form": {
-                                "type": "integer"
-                            },
-                            "last_page": {
-                                "type": "integer"
-                            },
-                            "path": {
-                                "type": "string"
-                            },
-                            "per_page": {
-                                "type": "integer"
-                            },
-                            "to": {
-                                "type": "integer"
-                            },
-                            "total": {
-                                "type": "integer"
-                            },
-                            "in_overdue": {
-                                "type": "integer"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "signalsEditable": {
-                "properties": {
-                    "id": {
-                        "description": "Represents a business signal definition.",
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "name": {
-                        "type": "string"
-                    },
-                    "detail": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "signals": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/signalsEditable"
-                    },
-                    {
-                        "properties": {
-                            "type": {
-                                "type": "string"
-                            },
-                            "processes": {
-                                "type": "array",
-                                "items": {
-                                    "properties": {
-                                        "id": {
-                                            "type": "integer",
-                                            "format": "id"
-                                        },
-                                        "is_system": {
-                                            "type": "boolean"
-                                        },
-                                        "name": {
-                                            "type": "string"
-                                        },
-                                        "catches": {
-                                            "type": "array",
-                                            "items": {
-                                                "properties": {
-                                                    "id": {
-                                                        "type": "integer",
-                                                        "format": "id"
-                                                    },
-                                                    "name": {
-                                                        "type": "string"
-                                                    },
-                                                    "type": {
-                                                        "type": "string"
-                                                    }
-                                                },
-                                                "type": "object"
-                                            }
-                                        }
-                                    },
-                                    "type": "object"
-                                }
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "columns": {
-                "properties": {
-                    "label": {
-                        "type": "string"
-                    },
-                    "field": {
-                        "type": "string"
-                    },
-                    "sortable": {
-                        "type": "boolean"
-                    },
-                    "default": {
-                        "type": "boolean"
-                    },
-                    "format": {
-                        "type": "string"
-                    },
-                    "mask": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "commentsEditable": {
-                "properties": {
-                    "id": {
-                        "description": "Represents a business process definition.",
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "user_id": {
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "commentable_id": {
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "commentable_type": {
-                        "type": "string"
-                    },
-                    "up": {
-                        "type": "integer"
-                    },
-                    "down": {
-                        "type": "integer"
-                    },
-                    "subject": {
-                        "type": "string"
-                    },
-                    "body": {
-                        "type": "string"
-                    },
-                    "hidden": {
-                        "type": "boolean"
-                    },
-                    "type": {
-                        "type": "string",
-                        "enum": [
-                            "LOG",
-                            "MESSAGE"
-                        ]
-                    }
-                },
-                "type": "object"
-            },
-            "comments": {
-                "type": "object",
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/commentsEditable"
-                    },
-                    {
-                        "properties": {
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "EnvironmentVariableEditable": {
-                "properties": {
-                    "name": {
-                        "type": "string"
-                    },
-                    "description": {
-                        "type": "string"
-                    },
-                    "value": {
-                        "type": "string"
-                    },
-                    "asset_type": {
-                        "type": "string",
-                        "nullable": true
-                    },
-                    "do_not_update": {
-                        "type": "boolean"
-                    }
-                },
-                "type": "object"
-            },
-            "EnvironmentVariable": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/EnvironmentVariableEditable"
-                    },
-                    {
-                        "properties": {
-                            "id": {
-                                "type": "integer",
-                                "format": "id"
-                            },
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "groupsEditable": {
-                "properties": {
-                    "name": {
-                        "description": "Represents a group definition.",
-                        "type": "string"
-                    },
-                    "description": {
-                        "type": "string"
-                    },
-                    "manager_id": {
-                        "type": "integer",
-                        "format": "id"
-                    },
-                    "status": {
-                        "type": "string",
-                        "enum": [
-                            "ACTIVE",
-                            "INACTIVE"
-                        ]
-                    }
-                },
-                "type": "object"
-            },
-            "groups": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/groupsEditable"
-                    },
-                    {
-                        "properties": {
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "id": {
-                                "type": "string",
-                                "format": "id"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "groupMembersEditable": {
-                "properties": {
-                    "group_id": {
-                        "description": "Represents a group Members definition.",
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "member_id": {
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "member_type": {
-                        "type": "string"
-                    },
-                    "description": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "groupMembers": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/groupMembersEditable"
-                    },
-                    {
-                        "properties": {
-                            "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "createGroupMembers": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/groupMembersEditable"
-                    },
-                    {
-                        "properties": {
-                            "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "group": {
-                                "type": "object"
-                            },
-                            "member": {
-                                "type": "object"
-                            },
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "getGroupMembersById": {
-                "allOf": [
-                    {
-                        "properties": {
-                            "group_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "member_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "member_type": {
-                                "type": "string"
-                            },
-                            "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "availableGroupMembers": {
-                "allOf": [
-                    {
-                        "properties": {
-                            "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "description": {
-                                "type": "string"
-                            },
-                            "name": {
-                                "type": "string"
-                            },
-                            "status": {
-                                "type": "string",
-                                "enum": [
-                                    "ACTIVE",
-                                    "INACTIVE"
-                                ]
-                            },
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "mediaEditable": {
-                "properties": {
-                    "id": {
-                        "description": "Represents media files stored in the database",
-                        "type": "integer",
-                        "format": "id"
-                    },
-                    "model_id": {
-                        "type": "integer",
-                        "format": "id"
-                    },
-                    "model_type": {
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "collection_name": {
-                        "type": "string"
-                    },
-                    "name": {
-                        "type": "string"
-                    },
-                    "file_name": {
-                        "type": "string"
-                    },
-                    "mime_type": {
-                        "type": "string"
-                    },
-                    "disk": {
-                        "type": "string"
-                    },
-                    "size": {
-                        "type": "integer"
-                    },
-                    "manipulations": {
-                        "type": "object"
-                    },
-                    "custom_properties": {
-                        "type": "object"
-                    },
-                    "responsive_images": {
-                        "type": "object"
-                    },
-                    "order_column": {
-                        "type": "integer"
-                    }
-                },
-                "type": "object"
-            },
-            "media": {
-                "type": "object",
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/mediaEditable"
-                    },
-                    {
-                        "properties": {
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "mediaExported": {
-                "properties": {
-                    "url": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "NotificationEditable": {
-                "properties": {
-                    "type": {
-                        "description": "Represents a notification definition.",
-                        "type": "string"
-                    },
-                    "notifiable_type": {
-                        "type": "string"
-                    },
-                    "notifiable_id": {
-                        "type": "integer"
-                    },
-                    "data": {
-                        "type": "string"
-                    },
-                    "name": {
-                        "type": "string"
-                    },
-                    "message": {
-                        "type": "string"
-                    },
-                    "processName": {
-                        "type": "string"
-                    },
-                    "userName": {
-                        "type": "string"
-                    },
-                    "request_id": {
-                        "type": "string"
-                    },
-                    "url": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "Notification": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/NotificationEditable"
-                    },
-                    {
-                        "properties": {
-                            "id": {
-                                "type": "string"
-                            },
-                            "read_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "ProcessEditable": {
+            "PaginationMeta": {
                 "properties": {
-                    "process_category_id": {
-                        "description": "Represents a business process definition.",
+                    "current_page": {
                         "type": "integer",
-                        "format": "id"
-                    },
-                    "name": {
-                        "type": "string"
+                        "example": 1
                     },
-                    "case_title": {
-                        "type": "string"
+                    "from": {
+                        "type": "integer",
+                        "example": 1
                     },
-                    "description": {
-                        "type": "string"
+                    "last_page": {
+                        "type": "integer",
+                        "example": 5
                     },
-                    "status": {
+                    "path": {
                         "type": "string",
-                        "enum": [
-                            "ACTIVE",
-                            "INACTIVE",
-                            "ARCHIVED"
-                        ]
-                    },
-                    "pause_timer_start": {
-                        "type": "integer"
-                    },
-                    "cancel_screen_id": {
-                        "type": "integer"
-                    },
-                    "has_timer_start_events": {
-                        "type": "boolean"
+                        "example": "http://processmaker.com/processes/variables"
                     },
-                    "request_detail_screen_id": {
+                    "per_page": {
                         "type": "integer",
-                        "format": "id"
-                    },
-                    "is_valid": {
-                        "type": "integer"
-                    },
-                    "package_key": {
-                        "type": "string"
-                    },
-                    "start_events": {
-                        "type": "array",
-                        "items": {
-                            "$ref": "#/components/schemas/ProcessStartEvents"
-                        }
-                    },
-                    "warnings": {
-                        "type": "string"
-                    },
-                    "self_service_tasks": {
-                        "type": "object"
-                    },
-                    "signal_events": {
-                        "type": "array",
-                        "items": {
-                            "type": "object"
-                        }
+                        "example": 20
                     },
-                    "category": {
-                        "type": "object"
+                    "to": {
+                        "type": "integer",
+                        "example": 20
                     },
-                    "manager_id": {
-                        "type": "array",
-                        "items": {
-                            "type": "integer",
-                            "format": "id"
-                        }
-                    }
-                },
-                "type": "object"
-            },
-            "Process": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/ProcessEditable"
+                    "total": {
+                        "type": "integer",
+                        "example": 100
                     },
-                    {
+                    "links": {
                         "properties": {
-                            "user_id": {
-                                "type": "integer",
-                                "format": "id"
-                            },
-                            "id": {
+                            "first": {
                                 "type": "string",
-                                "format": "id"
+                                "example": "http://processmaker.com/processes/variables?page=1"
                             },
-                            "deleted_at": {
+                            "last": {
                                 "type": "string",
-                                "format": "date-time"
+                                "example": "http://processmaker.com/processes/variables?page=5"
                             },
-                            "created_at": {
+                            "prev": {
                                 "type": "string",
-                                "format": "date-time"
+                                "nullable": true
                             },
-                            "updated_at": {
+                            "next": {
                                 "type": "string",
-                                "format": "date-time"
-                            },
-                            "notifications": {
-                                "type": "object"
-                            },
-                            "task_notifications": {
-                                "type": "object"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "ProcessStartEvents": {
-                "properties": {
-                    "eventDefinitions": {
-                        "type": "object"
-                    },
-                    "parallelMultiple": {
-                        "type": "boolean"
-                    },
-                    "outgoing": {
-                        "type": "object"
-                    },
-                    "incoming": {
-                        "type": "object"
-                    },
-                    "id": {
-                        "type": "string"
-                    },
-                    "name": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "ProcessWithStartEvents": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/Process"
-                    },
-                    {
-                        "properties": {
-                            "events": {
-                                "type": "array",
-                                "items": {
-                                    "$ref": "#/components/schemas/ProcessStartEvents"
-                                }
+                                "example": "http://processmaker.com/processes/variables?page=2"
                             }
                         },
                         "type": "object"
                     }
-                ]
-            },
-            "ProcessImport": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/ProcessEditable"
-                    },
-                    {
-                        "properties": {
-                            "status": {
-                                "type": "array",
-                                "items": {
-                                    "type": "object"
-                                }
-                            },
-                            "assignable": {
-                                "type": "array",
-                                "items": {
-                                    "type": "object"
-                                }
-                            },
-                            "process": {}
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "ProcessAssignments": {
-                "properties": {
-                    "assignable": {
-                        "type": "array",
-                        "items": {
-                            "type": "object"
-                        }
-                    },
-                    "cancel_request": {
-                        "type": "object"
-                    },
-                    "edit_data": {
-                        "type": "object"
-                    }
                 },
                 "type": "object"
             },
-            "ProcessCategoryEditable": {
+            "metadata": {
                 "properties": {
-                    "name": {
-                        "description": "Represents a business process category definition.",
+                    "filter": {
+                        "type": "string"
+                    },
+                    "sort_by": {
                         "type": "string"
                     },
-                    "status": {
+                    "sort_order": {
                         "type": "string",
                         "enum": [
-                            "ACTIVE",
-                            "INACTIVE"
+                            "asc",
+                            "desc"
                         ]
+                    },
+                    "count": {
+                        "type": "integer"
+                    },
+                    "total_pages": {
+                        "type": "integer"
+                    },
+                    "current_page": {
+                        "type": "integer"
+                    },
+                    "form": {
+                        "type": "integer"
+                    },
+                    "last_page": {
+                        "type": "integer"
+                    },
+                    "path": {
+                        "type": "string"
+                    },
+                    "per_page": {
+                        "type": "integer"
+                    },
+                    "to": {
+                        "type": "integer"
+                    },
+                    "total": {
+                        "type": "integer"
                     }
                 },
                 "type": "object"
             },
-            "ProcessCategory": {
+            "taskMetadata": {
+                "type": "object",
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/ProcessCategoryEditable"
+                        "$ref": "#/components/schemas/metadata"
                     },
                     {
                         "properties": {
-                            "id": {
-                                "type": "string",
-                                "format": "id"
+                            "filter": {
+                                "type": "string"
                             },
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
+                            "sort_by": {
+                                "type": "string"
                             },
-                            "updated_at": {
+                            "sort_order": {
                                 "type": "string",
-                                "format": "date-time"
+                                "enum": [
+                                    "asc",
+                                    "desc"
+                                ]
+                            },
+                            "count": {
+                                "type": "integer"
+                            },
+                            "total_pages": {
+                                "type": "integer"
+                            },
+                            "current_page": {
+                                "type": "integer"
+                            },
+                            "form": {
+                                "type": "integer"
+                            },
+                            "last_page": {
+                                "type": "integer"
+                            },
+                            "path": {
+                                "type": "string"
+                            },
+                            "per_page": {
+                                "type": "integer"
+                            },
+                            "to": {
+                                "type": "integer"
+                            },
+                            "total": {
+                                "type": "integer"
+                            },
+                            "in_overdue": {
+                                "type": "integer"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "processPermissionsEditable": {
+            "signalsEditable": {
                 "properties": {
                     "id": {
-                        "description": "Represents a Process permission.",
-                        "type": "integer",
-                        "format": "id"
-                    },
-                    "process_id": {
-                        "type": "integer",
-                        "format": "id"
-                    },
-                    "permission_id": {
-                        "type": "integer",
+                        "description": "Represents a business signal definition.",
+                        "type": "string",
                         "format": "id"
                     },
-                    "assignable_id": {
-                        "type": "integer",
-                        "format": "id"
+                    "name": {
+                        "type": "string"
                     },
-                    "assignable_type": {
+                    "detail": {
                         "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "processPermissions": {
-                "type": "object",
+            "signals": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/processPermissionsEditable"
+                        "$ref": "#/components/schemas/signalsEditable"
                     },
                     {
                         "properties": {
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
+                            "type": {
+                                "type": "string"
                             },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
+                            "processes": {
+                                "type": "array",
+                                "items": {
+                                    "properties": {
+                                        "id": {
+                                            "type": "integer",
+                                            "format": "id"
+                                        },
+                                        "is_system": {
+                                            "type": "boolean"
+                                        },
+                                        "name": {
+                                            "type": "string"
+                                        },
+                                        "catches": {
+                                            "type": "array",
+                                            "items": {
+                                                "properties": {
+                                                    "id": {
+                                                        "type": "integer",
+                                                        "format": "id"
+                                                    },
+                                                    "name": {
+                                                        "type": "string"
+                                                    },
+                                                    "type": {
+                                                        "type": "string"
+                                                    }
+                                                },
+                                                "type": "object"
+                                            }
+                                        }
+                                    },
+                                    "type": "object"
+                                }
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "processRequestEditable": {
+            "columns": {
                 "properties": {
-                    "user_id": {
-                        "description": "Represents an Eloquent model of a Request which is an instance of a Process.",
+                    "label": {
+                        "type": "string"
+                    },
+                    "field": {
+                        "type": "string"
+                    },
+                    "sortable": {
+                        "type": "boolean"
+                    },
+                    "default": {
+                        "type": "boolean"
+                    },
+                    "format": {
+                        "type": "string"
+                    },
+                    "mask": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "commentsEditable": {
+                "properties": {
+                    "id": {
+                        "description": "Represents a business process definition.",
                         "type": "string",
                         "format": "id"
                     },
-                    "callable_id": {
+                    "user_id": {
                         "type": "string",
                         "format": "id"
                     },
-                    "data": {
-                        "type": "object"
-                    },
-                    "status": {
+                    "commentable_id": {
                         "type": "string",
-                        "enum": [
-                            "ACTIVE",
-                            "COMPLETED",
-                            "ERROR",
-                            "CANCELED"
-                        ]
+                        "format": "id"
                     },
-                    "name": {
+                    "commentable_type": {
                         "type": "string"
                     },
-                    "case_title": {
-                        "type": "string"
+                    "up": {
+                        "type": "integer"
                     },
-                    "case_title_formatted": {
-                        "type": "string"
+                    "down": {
+                        "type": "integer"
                     },
-                    "user_viewed_at": {
+                    "subject": {
                         "type": "string"
                     },
-                    "case_number": {
-                        "type": "integer"
+                    "body": {
+                        "type": "string"
                     },
-                    "process_id": {
-                        "type": "integer"
+                    "hidden": {
+                        "type": "boolean"
                     },
-                    "process": {
-                        "type": "object"
+                    "type": {
+                        "type": "string",
+                        "enum": [
+                            "LOG",
+                            "MESSAGE"
+                        ]
                     }
                 },
-                "type": "object"
-            },
-            "processRequest": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/processRequestEditable"
-                    },
-                    {
-                        "properties": {
-                            "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "process_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "process_collaboration_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "participant_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "process_category_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
+                "type": "object"
+            },
+            "comments": {
+                "type": "object",
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/commentsEditable"
+                    },
+                    {
+                        "properties": {
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -10021,83 +6465,37 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
-                            },
-                            "user": {},
-                            "participants": {
-                                "type": "array",
-                                "items": {
-                                    "$ref": "#/components/schemas/users"
-                                }
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "processRequestTokenEditable": {
+            "EnvironmentVariableEditable": {
                 "properties": {
-                    "user_id": {
-                        "description": "ProcessRequestToken is used to store the state of a token of the\nNayra engine",
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "status": {
+                    "name": {
                         "type": "string"
                     },
-                    "due_at": {
-                        "type": "string",
-                        "format": "date-time"
-                    },
-                    "initiated_at": {
-                        "type": "string",
-                        "format": "date-time"
-                    },
-                    "riskchanges_at": {
-                        "type": "string",
-                        "format": "date-time"
-                    },
-                    "subprocess_start_event_id": {
+                    "description": {
                         "type": "string"
                     },
-                    "data": {
-                        "type": "object"
+                    "value": {
+                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "processRequestToken": {
+            "EnvironmentVariable": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/processRequestTokenEditable"
+                        "$ref": "#/components/schemas/EnvironmentVariableEditable"
                     },
                     {
                         "properties": {
                             "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "process_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "process_request_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "element_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "element_type": {
-                                "type": "string",
+                                "type": "integer",
                                 "format": "id"
                             },
-                            "element_index": {
-                                "type": "string"
-                            },
-                            "element_name": {
-                                "type": "string"
-                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -10105,68 +6503,42 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
-                            },
-                            "initiated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "advanceStatus": {
-                                "type": "string"
-                            },
-                            "due_notified": {
-                                "type": "integer"
-                            },
-                            "user": {
-                                "type": "object"
-                            },
-                            "process": {
-                                "type": "object"
-                            },
-                            "process_request": {
-                                "type": "object"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "taskAssignmentsEditable": {
+            "groupsEditable": {
                 "properties": {
-                    "process_id": {
-                        "description": "Represents a business process task assignment definition.",
-                        "type": "integer",
-                        "format": "id"
+                    "name": {
+                        "description": "Represents a group definition.",
+                        "type": "string"
                     },
-                    "process_task_id": {
-                        "type": "string",
-                        "format": "id"
+                    "description": {
+                        "type": "string"
                     },
-                    "assignment_id": {
+                    "manager_id": {
                         "type": "integer",
                         "format": "id"
                     },
-                    "assignment_type": {
+                    "status": {
                         "type": "string",
                         "enum": [
-                            "ProcessMaker\\Models\\User",
-                            "ProcessMaker\\Models\\Group"
+                            "ACTIVE",
+                            "INACTIVE"
                         ]
                     }
                 },
                 "type": "object"
             },
-            "taskAssignments": {
-                "type": "object",
+            "groups": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/taskAssignmentsEditable"
+                        "$ref": "#/components/schemas/groupsEditable"
                     },
                     {
                         "properties": {
-                            "id": {
-                                "type": "integer",
-                                "format": "id"
-                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -10174,55 +6546,40 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
+                            },
+                            "id": {
+                                "type": "string",
+                                "format": "id"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "screensEditable": {
+            "groupMembersEditable": {
                 "properties": {
-                    "title": {
-                        "description": "Class Screen",
-                        "type": "string"
-                    },
-                    "type": {
-                        "type": "string"
-                    },
-                    "description": {
-                        "type": "string"
-                    },
-                    "config": {
-                        "type": "array",
-                        "items": {
-                            "type": "object"
-                        }
-                    },
-                    "computed": {
-                        "type": "array",
-                        "items": {
-                            "type": "object"
-                        }
+                    "group_id": {
+                        "description": "Represents a group Members definition.",
+                        "type": "string",
+                        "format": "id"
                     },
-                    "watchers": {
-                        "type": "array",
-                        "items": {
-                            "type": "object"
-                        }
+                    "member_id": {
+                        "type": "string",
+                        "format": "id"
                     },
-                    "custom_css": {
+                    "member_type": {
                         "type": "string"
                     },
-                    "screen_category_id": {
+                    "description": {
                         "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "screens": {
+            "groupMembers": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/screensEditable"
+                        "$ref": "#/components/schemas/groupMembersEditable"
                     },
                     {
                         "properties": {
@@ -10243,34 +6600,10 @@
                     }
                 ]
             },
-            "screenExported": {
-                "properties": {
-                    "url": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "ScreenCategoryEditable": {
-                "properties": {
-                    "name": {
-                        "description": "Represents a business screen category definition.",
-                        "type": "string"
-                    },
-                    "status": {
-                        "type": "string",
-                        "enum": [
-                            "ACTIVE",
-                            "INACTIVE"
-                        ]
-                    }
-                },
-                "type": "object"
-            },
-            "ScreenCategory": {
+            "createGroupMembers": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/ScreenCategoryEditable"
+                        "$ref": "#/components/schemas/groupMembersEditable"
                     },
                     {
                         "properties": {
@@ -10278,6 +6611,12 @@
                                 "type": "string",
                                 "format": "id"
                             },
+                            "group": {
+                                "type": "object"
+                            },
+                            "member": {
+                                "type": "object"
+                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -10291,72 +6630,128 @@
                     }
                 ]
             },
-            "ScreenTypeEditable": {
-                "properties": {
-                    "name": {
-                        "description": "Represents a business screen Type definition.",
-                        "type": "string"
+            "getGroupMembersById": {
+                "allOf": [
+                    {
+                        "properties": {
+                            "group_id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "member_id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "member_type": {
+                                "type": "string"
+                            },
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
+                        },
+                        "type": "object"
                     }
-                },
-                "type": "object"
+                ]
             },
-            "ScreenType": {
+            "availableGroupMembers": {
                 "allOf": [
-                    {
-                        "$ref": "#/components/schemas/ScreenTypeEditable"
-                    },
                     {
                         "properties": {
                             "id": {
                                 "type": "string",
-                                "format": "id"
+                                "format": "id"
+                            },
+                            "description": {
+                                "type": "string"
+                            },
+                            "name": {
+                                "type": "string"
+                            },
+                            "status": {
+                                "type": "string",
+                                "enum": [
+                                    "ACTIVE",
+                                    "INACTIVE"
+                                ]
+                            },
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "scriptsEditable": {
+            "mediaEditable": {
                 "properties": {
-                    "title": {
-                        "description": "Represents an Eloquent model of a Script",
+                    "id": {
+                        "description": "Represents media files stored in the database",
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "model_id": {
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "model_type": {
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "collection_name": {
                         "type": "string"
                     },
-                    "description": {
+                    "name": {
                         "type": "string"
                     },
-                    "language": {
+                    "file_name": {
                         "type": "string"
                     },
-                    "code": {
+                    "mime_type": {
                         "type": "string"
                     },
-                    "timeout": {
-                        "type": "integer"
+                    "disk": {
+                        "type": "string"
                     },
-                    "run_as_user_id": {
+                    "size": {
                         "type": "integer"
                     },
-                    "key": {
-                        "type": "string"
+                    "manipulations": {
+                        "type": "object"
                     },
-                    "script_category_id": {
+                    "custom_properties": {
+                        "type": "object"
+                    },
+                    "responsive_images": {
+                        "type": "object"
+                    },
+                    "order_column": {
                         "type": "integer"
                     }
                 },
                 "type": "object"
             },
-            "scripts": {
+            "media": {
+                "type": "object",
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/scriptsEditable"
+                        "$ref": "#/components/schemas/mediaEditable"
                     },
                     {
                         "properties": {
-                            "id": {
-                                "type": "integer",
-                                "format": "id"
-                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -10370,91 +6765,63 @@
                     }
                 ]
             },
-            "scriptsPreview": {
+            "mediaExported": {
                 "properties": {
-                    "status": {
-                        "type": "string"
-                    },
-                    "key": {
+                    "url": {
                         "type": "string"
-                    },
-                    "output": {
-                        "type": "object"
                     }
                 },
                 "type": "object"
             },
-            "ScriptCategoryEditable": {
+            "NotificationEditable": {
                 "properties": {
-                    "name": {
-                        "description": "Represents a business script category definition.",
+                    "type": {
+                        "description": "Represents a notification definition.",
                         "type": "string"
                     },
-                    "status": {
-                        "type": "string",
-                        "enum": [
-                            "ACTIVE",
-                            "INACTIVE"
-                        ]
-                    }
-                },
-                "type": "object"
-            },
-            "ScriptCategory": {
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/ScriptCategoryEditable"
+                    "notifiable_type": {
+                        "type": "string"
                     },
-                    {
-                        "properties": {
-                            "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
-            },
-            "scriptExecutorsEditable": {
-                "properties": {
-                    "title": {
-                        "description": "Represents an Eloquent model of a Script Executor",
+                    "notifiable_id": {
+                        "type": "integer"
+                    },
+                    "data": {
                         "type": "string"
                     },
-                    "description": {
+                    "name": {
                         "type": "string"
                     },
-                    "language": {
+                    "message": {
                         "type": "string"
                     },
-                    "config": {
+                    "processName": {
                         "type": "string"
                     },
-                    "is_system": {
-                        "type": "boolean"
+                    "userName": {
+                        "type": "string"
+                    },
+                    "request_id": {
+                        "type": "string"
+                    },
+                    "url": {
+                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "scriptExecutors": {
+            "Notification": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/scriptExecutorsEditable"
+                        "$ref": "#/components/schemas/NotificationEditable"
                     },
                     {
                         "properties": {
                             "id": {
-                                "type": "integer",
-                                "format": "id"
+                                "type": "string"
+                            },
+                            "read_at": {
+                                "type": "string",
+                                "format": "date-time"
                             },
                             "created_at": {
                                 "type": "string",
@@ -10469,130 +6836,99 @@
                     }
                 ]
             },
-            "availableLanguages": {
+            "ProcessEditable": {
                 "properties": {
-                    "text": {
+                    "process_category_id": {
+                        "description": "Represents a business process definition.",
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "name": {
                         "type": "string"
                     },
-                    "value": {
+                    "case_title": {
                         "type": "string"
                     },
-                    "initDockerFile": {
+                    "description": {
                         "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "securityLog": {
-                "properties": {
-                    "id": {
-                        "description": "Class SecurityLog",
+                    },
+                    "status": {
+                        "type": "string",
+                        "enum": [
+                            "ACTIVE",
+                            "INACTIVE",
+                            "ARCHIVED"
+                        ]
+                    },
+                    "pause_timer_start": {
                         "type": "integer"
                     },
-                    "event": {
-                        "type": "string"
+                    "cancel_screen_id": {
+                        "type": "integer"
                     },
-                    "ip": {
-                        "type": "string"
+                    "has_timer_start_events": {
+                        "type": "boolean"
                     },
-                    "meta": {
-                        "type": "array",
-                        "items": {
-                            "properties": {
-                                "os": {
-                                    "type": "array",
-                                    "items": {
-                                        "properties": {
-                                            "name": {
-                                                "type": "string"
-                                            },
-                                            "version": {
-                                                "type": "string"
-                                            }
-                                        },
-                                        "type": "object"
-                                    }
-                                },
-                                "browser": {
-                                    "type": "array",
-                                    "items": {
-                                        "properties": {
-                                            "name": {
-                                                "type": "string"
-                                            },
-                                            "version": {
-                                                "type": "string"
-                                            }
-                                        },
-                                        "type": "object"
-                                    }
-                                },
-                                "user_agent": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
+                    "request_detail_screen_id": {
+                        "type": "integer",
+                        "format": "id"
                     },
-                    "user_id": {
+                    "is_valid": {
                         "type": "integer"
                     },
-                    "occured_at": {
-                        "type": "string"
-                    }
-                },
-                "type": "object"
-            },
-            "settingsEditable": {
-                "properties": {
-                    "key": {
-                        "description": "Class Settings",
+                    "package_key": {
                         "type": "string"
                     },
-                    "config": {
+                    "start_events": {
                         "type": "array",
                         "items": {
-                            "type": "object"
+                            "$ref": "#/components/schemas/ProcessStartEvents"
                         }
                     },
-                    "name": {
-                        "type": "string"
-                    },
-                    "helper": {
-                        "type": "string"
-                    },
-                    "group": {
-                        "type": "string"
-                    },
-                    "format": {
+                    "warnings": {
                         "type": "string"
                     },
-                    "hidden": {
-                        "type": "boolean"
+                    "self_service_tasks": {
+                        "type": "object"
                     },
-                    "readonly": {
-                        "type": "boolean"
+                    "signal_events": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
                     },
-                    "variables": {
-                        "type": "string"
+                    "category": {
+                        "type": "object"
                     },
-                    "sansSerifFont": {
-                        "type": "string"
+                    "manager_id": {
+                        "type": "array",
+                        "items": {
+                            "type": "integer",
+                            "format": "id"
+                        }
                     }
                 },
                 "type": "object"
             },
-            "settings": {
+            "Process": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/settingsEditable"
+                        "$ref": "#/components/schemas/ProcessEditable"
                     },
                     {
                         "properties": {
+                            "user_id": {
+                                "type": "integer",
+                                "format": "id"
+                            },
                             "id": {
                                 "type": "string",
                                 "format": "id"
                             },
+                            "deleted_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -10600,173 +6936,174 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
+                            },
+                            "notifications": {
+                                "type": "object"
+                            },
+                            "task_notifications": {
+                                "type": "object"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "TokenClient": {
+            "ProcessStartEvents": {
                 "properties": {
-                    "id": {
-                        "type": "integer"
+                    "eventDefinitions": {
+                        "type": "object"
                     },
-                    "user_id": {
-                        "type": "integer"
+                    "parallelMultiple": {
+                        "type": "boolean"
                     },
-                    "name": {
-                        "type": "string"
+                    "outgoing": {
+                        "type": "object"
                     },
-                    "provider": {
-                        "type": "string"
+                    "incoming": {
+                        "type": "object"
                     },
-                    "redirect": {
+                    "id": {
                         "type": "string"
                     },
-                    "personal_access_client": {
-                        "type": "boolean"
+                    "name": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "ProcessWithStartEvents": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/Process"
                     },
-                    "password_client": {
-                        "type": "boolean"
+                    {
+                        "properties": {
+                            "events": {
+                                "type": "array",
+                                "items": {
+                                    "$ref": "#/components/schemas/ProcessStartEvents"
+                                }
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "ProcessImport": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/ProcessEditable"
                     },
-                    "revoked": {
-                        "type": "boolean"
+                    {
+                        "properties": {
+                            "status": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object"
+                                }
+                            },
+                            "assignable": {
+                                "type": "array",
+                                "items": {
+                                    "type": "object"
+                                }
+                            },
+                            "process": {}
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "ProcessAssignments": {
+                "properties": {
+                    "assignable": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
                     },
-                    "created_at": {
-                        "type": "string",
-                        "format": "date-time"
+                    "cancel_request": {
+                        "type": "object"
                     },
-                    "updated_at": {
-                        "type": "string",
-                        "format": "date-time"
+                    "edit_data": {
+                        "type": "object"
                     }
                 },
                 "type": "object"
             },
-            "usersEditable": {
+            "ProcessCategoryEditable": {
                 "properties": {
-                    "email": {
-                        "description": "The attributes that are mass assignable.",
-                        "type": "string",
-                        "format": "email"
-                    },
-                    "firstname": {
-                        "type": "string"
-                    },
-                    "lastname": {
-                        "type": "string"
-                    },
-                    "username": {
-                        "type": "string"
-                    },
-                    "password": {
-                        "type": "string"
-                    },
-                    "address": {
-                        "type": "string"
-                    },
-                    "city": {
-                        "type": "string"
-                    },
-                    "state": {
-                        "type": "string"
-                    },
-                    "postal": {
-                        "type": "string"
-                    },
-                    "country": {
-                        "type": "string"
-                    },
-                    "phone": {
-                        "type": "string"
-                    },
-                    "fax": {
-                        "type": "string"
-                    },
-                    "cell": {
-                        "type": "string"
-                    },
-                    "title": {
-                        "type": "string"
-                    },
-                    "timezone": {
-                        "type": "string"
-                    },
-                    "datetime_format": {
-                        "type": "string"
-                    },
-                    "language": {
-                        "type": "string"
-                    },
-                    "is_administrator": {
-                        "type": "boolean"
-                    },
-                    "expires_at": {
-                        "type": "string"
-                    },
-                    "loggedin_at": {
-                        "type": "string"
-                    },
-                    "remember_token": {
+                    "name": {
+                        "description": "Represents a business process category definition.",
                         "type": "string"
                     },
                     "status": {
                         "type": "string",
                         "enum": [
                             "ACTIVE",
-                            "INACTIVE",
-                            "SCHEDULED",
-                            "OUT_OF_OFFICE",
-                            "BLOCKED"
+                            "INACTIVE"
                         ]
+                    }
+                },
+                "type": "object"
+            },
+            "ProcessCategory": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/ProcessCategoryEditable"
                     },
-                    "fullname": {
-                        "type": "string"
-                    },
-                    "avatar": {
-                        "type": "string"
-                    },
-                    "media": {
-                        "type": "array",
-                        "items": {
-                            "$ref": "#/components/schemas/media"
-                        }
-                    },
-                    "birthdate": {
-                        "type": "string",
-                        "format": "date"
+                    {
+                        "properties": {
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "processPermissionsEditable": {
+                "properties": {
+                    "id": {
+                        "description": "Represents a Process permission.",
+                        "type": "integer",
+                        "format": "id"
                     },
-                    "delegation_user_id": {
-                        "type": "string",
+                    "process_id": {
+                        "type": "integer",
                         "format": "id"
                     },
-                    "manager_id": {
-                        "type": "string",
+                    "permission_id": {
+                        "type": "integer",
                         "format": "id"
                     },
-                    "meta": {
-                        "type": "object",
-                        "additionalProperties": true
-                    },
-                    "force_change_password": {
-                        "type": "boolean"
+                    "assignable_id": {
+                        "type": "integer",
+                        "format": "id"
                     },
-                    "email_task_notification": {
-                        "type": "boolean"
+                    "assignable_type": {
+                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "users": {
+            "processPermissions": {
+                "type": "object",
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/usersEditable"
+                        "$ref": "#/components/schemas/processPermissionsEditable"
                     },
                     {
                         "properties": {
-                            "id": {
-                                "type": "integer"
-                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -10774,119 +7111,99 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
-                            },
-                            "deleted_at": {
-                                "type": "string",
-                                "format": "date-time"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "UserToken": {
+            "processRequestEditable": {
                 "properties": {
-                    "id": {
-                        "type": "string"
-                    },
                     "user_id": {
-                        "type": "integer"
-                    },
-                    "client_id": {
-                        "type": "integer"
+                        "description": "Represents an Eloquent model of a Request which is an instance of a Process.",
+                        "type": "string",
+                        "format": "id"
                     },
-                    "name": {
-                        "type": "string"
+                    "callable_id": {
+                        "type": "string",
+                        "format": "id"
                     },
-                    "scopes": {
+                    "data": {
                         "type": "object"
                     },
-                    "revoked": {
-                        "type": "boolean"
-                    },
-                    "client": {
-                        "$ref": "#/components/schemas/TokenClient"
-                    },
-                    "created_at": {
-                        "type": "string",
-                        "format": "date-time"
-                    },
-                    "updated_at": {
+                    "status": {
                         "type": "string",
-                        "format": "date-time"
+                        "enum": [
+                            "ACTIVE",
+                            "COMPLETED",
+                            "ERROR",
+                            "CANCELED"
+                        ]
                     },
-                    "expires_at": {
-                        "type": "string",
-                        "format": "date-time"
-                    }
-                },
-                "type": "object"
-            },
-            "collectionsEditable": {
-                "properties": {
                     "name": {
                         "type": "string"
                     },
-                    "description": {
+                    "case_title": {
                         "type": "string"
                     },
-                    "custom_title": {
+                    "case_title_formatted": {
                         "type": "string"
                     },
-                    "create_screen_id": {
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "read_screen_id": {
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "update_screen_id": {
-                        "type": "string",
-                        "format": "id"
+                    "user_viewed_at": {
+                        "type": "string"
                     },
-                    "signal_create": {
-                        "type": "boolean"
+                    "case_number": {
+                        "type": "integer"
                     },
-                    "signal_update": {
-                        "type": "boolean"
+                    "process_id": {
+                        "type": "integer"
                     },
-                    "signal_delete": {
-                        "type": "boolean"
+                    "process": {
+                        "type": "object"
                     }
                 },
                 "type": "object"
             },
-            "collections": {
+            "processRequest": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/collectionsEditable"
+                        "$ref": "#/components/schemas/processRequestEditable"
                     },
                     {
                         "properties": {
                             "id": {
-                                "type": "integer"
+                                "type": "string",
+                                "format": "id"
                             },
-                            "created_at": {
+                            "process_id": {
                                 "type": "string",
-                                "format": "date-time"
+                                "format": "id"
                             },
-                            "updated_at": {
+                            "process_collaboration_id": {
                                 "type": "string",
-                                "format": "date-time"
+                                "format": "id"
                             },
-                            "created_by_id": {
+                            "participant_id": {
                                 "type": "string",
                                 "format": "id"
                             },
-                            "updated_by_id": {
+                            "process_category_id": {
                                 "type": "string",
                                 "format": "id"
                             },
-                            "columns": {
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "user": {},
+                            "participants": {
                                 "type": "array",
                                 "items": {
-                                    "type": "object"
+                                    "$ref": "#/components/schemas/users"
                                 }
                             }
                         },
@@ -10894,122 +7211,202 @@
                     }
                 ]
             },
-            "recordsEditable": {
+            "processRequestTokenEditable": {
                 "properties": {
+                    "user_id": {
+                        "description": "ProcessRequestToken is used to store the state of a token of the\nNayra engine",
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "status": {
+                        "type": "string"
+                    },
+                    "due_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "initiated_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "riskchanges_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "subprocess_start_event_id": {
+                        "type": "string"
+                    },
                     "data": {
                         "type": "object"
                     }
                 },
                 "type": "object"
             },
-            "records": {
+            "processRequestToken": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/recordsEditable"
+                        "$ref": "#/components/schemas/processRequestTokenEditable"
                     },
                     {
                         "properties": {
                             "id": {
-                                "type": "integer"
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "process_id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "process_request_id": {
+                                "type": "string",
+                                "format": "id"
+                            },
+                            "element_id": {
+                                "type": "string",
+                                "format": "id"
                             },
-                            "collection_id": {
+                            "element_type": {
                                 "type": "string",
                                 "format": "id"
+                            },
+                            "element_index": {
+                                "type": "string"
+                            },
+                            "element_name": {
+                                "type": "string"
+                            },
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "initiated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "advanceStatus": {
+                                "type": "string"
+                            },
+                            "due_notified": {
+                                "type": "integer"
+                            },
+                            "user": {
+                                "type": "object"
+                            },
+                            "process": {
+                                "type": "object"
+                            },
+                            "process_request": {
+                                "type": "object"
                             }
                         },
                         "type": "object"
                     }
                 ]
             },
-            "DataSourceCallParameters": {
+            "taskAssignmentsEditable": {
                 "properties": {
-                    "endpoint": {
-                        "type": "string"
+                    "process_id": {
+                        "description": "Represents a business process task assignment definition.",
+                        "type": "integer",
+                        "format": "id"
                     },
-                    "dataMapping": {
-                        "type": "array",
-                        "items": {
-                            "properties": {
-                                "key": {
-                                    "type": "string"
-                                },
-                                "value": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
+                    "process_task_id": {
+                        "type": "string",
+                        "format": "id"
                     },
-                    "outboundConfig": {
-                        "type": "array",
-                        "items": {
-                            "properties": {
-                                "key": {
-                                    "type": "string"
-                                },
-                                "value": {
-                                    "type": "string"
-                                }
-                            },
-                            "type": "object"
-                        }
+                    "assignment_id": {
+                        "type": "integer",
+                        "format": "id"
+                    },
+                    "assignment_type": {
+                        "type": "string",
+                        "enum": [
+                            "ProcessMaker\\Models\\User",
+                            "ProcessMaker\\Models\\Group"
+                        ]
                     }
                 },
                 "type": "object"
             },
-            "DataSourceResponse": {
-                "properties": {
-                    "status": {
-                        "type": "integer"
+            "taskAssignments": {
+                "type": "object",
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/taskAssignmentsEditable"
                     },
-                    "response": {
+                    {
+                        "properties": {
+                            "id": {
+                                "type": "integer",
+                                "format": "id"
+                            },
+                            "created_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            },
+                            "updated_at": {
+                                "type": "string",
+                                "format": "date-time"
+                            }
+                        },
                         "type": "object"
                     }
-                },
-                "type": "object"
+                ]
             },
-            "dataSourceEditable": {
+            "screensEditable": {
                 "properties": {
-                    "id": {
-                        "description": "Class DataSource",
-                        "type": "string",
-                        "format": "id"
-                    },
-                    "name": {
+                    "title": {
+                        "description": "Class Screen",
                         "type": "string"
                     },
-                    "description": {
+                    "type": {
                         "type": "string"
                     },
-                    "endpoints": {
+                    "description": {
                         "type": "string"
                     },
-                    "mappings": {
-                        "type": "string"
+                    "config": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
                     },
-                    "authtype": {
-                        "type": "string"
+                    "computed": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
                     },
-                    "credentials": {
-                        "type": "string"
+                    "watchers": {
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
                     },
-                    "status": {
+                    "custom_css": {
                         "type": "string"
                     },
-                    "data_source_category_id": {
+                    "screen_category_id": {
                         "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "dataSource": {
-                "type": "object",
+            "screens": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/dataSourceEditable"
+                        "$ref": "#/components/schemas/screensEditable"
                     },
                     {
                         "properties": {
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -11023,10 +7420,18 @@
                     }
                 ]
             },
-            "dataSourceCategoryEditable": {
+            "screenExported": {
+                "properties": {
+                    "url": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "ScreenCategoryEditable": {
                 "properties": {
                     "name": {
-                        "description": "Represents a business data Source category definition.",
+                        "description": "Represents a business screen category definition.",
                         "type": "string"
                     },
                     "status": {
@@ -11039,11 +7444,10 @@
                 },
                 "type": "object"
             },
-            "DataSourceCategory": {
-                "type": "object",
+            "ScreenCategory": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/dataSourceCategoryEditable"
+                        "$ref": "#/components/schemas/ScreenCategoryEditable"
                     },
                     {
                         "properties": {
@@ -11064,36 +7468,72 @@
                     }
                 ]
             },
-            "decisionTableEditable": {
+            "ScreenTypeEditable": {
                 "properties": {
-                    "id": {
-                        "description": "Class Screen",
-                        "type": "string",
-                        "format": "id"
-                    },
                     "name": {
+                        "description": "Represents a business screen Type definition.",
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "ScreenType": {
+                "allOf": [
+                    {
+                        "$ref": "#/components/schemas/ScreenTypeEditable"
+                    },
+                    {
+                        "properties": {
+                            "id": {
+                                "type": "string",
+                                "format": "id"
+                            }
+                        },
+                        "type": "object"
+                    }
+                ]
+            },
+            "scriptsEditable": {
+                "properties": {
+                    "title": {
+                        "description": "Represents an Eloquent model of a Script",
                         "type": "string"
                     },
                     "description": {
                         "type": "string"
                     },
-                    "definition": {
+                    "language": {
+                        "type": "string"
+                    },
+                    "code": {
                         "type": "string"
                     },
-                    "decision_table_categories_id": {
+                    "timeout": {
+                        "type": "integer"
+                    },
+                    "run_as_user_id": {
+                        "type": "integer"
+                    },
+                    "key": {
                         "type": "string"
+                    },
+                    "script_category_id": {
+                        "type": "integer"
                     }
                 },
                 "type": "object"
             },
-            "decisionTable": {
-                "type": "object",
+            "scripts": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/decisionTableEditable"
+                        "$ref": "#/components/schemas/scriptsEditable"
                     },
                     {
                         "properties": {
+                            "id": {
+                                "type": "integer",
+                                "format": "id"
+                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -11107,18 +7547,24 @@
                     }
                 ]
             },
-            "DecisionTableExported": {
+            "scriptsPreview": {
                 "properties": {
-                    "url": {
+                    "status": {
                         "type": "string"
+                    },
+                    "key": {
+                        "type": "string"
+                    },
+                    "output": {
+                        "type": "object"
                     }
                 },
                 "type": "object"
             },
-            "decisionTableCategoryEditable": {
+            "ScriptCategoryEditable": {
                 "properties": {
                     "name": {
-                        "description": "Represents a business decision Table category definition.",
+                        "description": "Represents a business script category definition.",
                         "type": "string"
                     },
                     "status": {
@@ -11131,11 +7577,10 @@
                 },
                 "type": "object"
             },
-            "DecisionTableCategory": {
-                "type": "object",
+            "ScriptCategory": {
                 "allOf": [
                     {
-                        "$ref": "#/components/schemas/decisionTableCategoryEditable"
+                        "$ref": "#/components/schemas/ScriptCategoryEditable"
                     },
                     {
                         "properties": {
@@ -11156,43 +7601,36 @@
                     }
                 ]
             },
-            "SavedSearchEditable": {
+            "scriptExecutorsEditable": {
                 "properties": {
-                    "meta": {
-                        "description": "Represents an Eloquent model of a Saved Search.",
-                        "type": "object",
-                        "additionalProperties": "true"
+                    "title": {
+                        "description": "Represents an Eloquent model of a Script Executor",
+                        "type": "string"
                     },
-                    "pmql": {
+                    "description": {
                         "type": "string"
                     },
-                    "title": {
+                    "language": {
                         "type": "string"
                     },
-                    "type": {
-                        "type": "string",
-                        "enum": [
-                            "task",
-                            "request"
-                        ]
+                    "config": {
+                        "type": "string"
                     },
-                    "advanced_filter": {
-                        "type": "object",
-                        "additionalProperties": "true"
+                    "is_system": {
+                        "type": "boolean"
                     }
                 },
                 "type": "object"
             },
-            "SavedSearch": {
+            "scriptExecutors": {
                 "allOf": [
+                    {
+                        "$ref": "#/components/schemas/scriptExecutorsEditable"
+                    },
                     {
                         "properties": {
                             "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "user_id": {
-                                "type": "string",
+                                "type": "integer",
                                 "format": "id"
                             },
                             "created_at": {
@@ -11205,65 +7643,133 @@
                             }
                         },
                         "type": "object"
-                    },
-                    {
-                        "$ref": "#/components/schemas/SavedSearchEditable"
                     }
                 ]
             },
-            "SavedSearchIcon": {
+            "availableLanguages": {
                 "properties": {
-                    "name": {
+                    "text": {
                         "type": "string"
                     },
                     "value": {
                         "type": "string"
+                    },
+                    "initDockerFile": {
+                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "SavedSearchChartEditable": {
+            "securityLog": {
                 "properties": {
-                    "title": {
-                        "description": "Represents an Eloquent model of a Saved Search Chart.",
+                    "id": {
+                        "description": "Class SecurityLog",
+                        "type": "integer"
+                    },
+                    "event": {
                         "type": "string"
                     },
-                    "type": {
-                        "type": "string",
-                        "enum": [
-                            "bar",
-                            "bar-vertical",
-                            "line",
-                            "pie",
-                            "doughnut"
-                        ]
+                    "ip": {
+                        "type": "string"
+                    },
+                    "meta": {
+                        "type": "array",
+                        "items": {
+                            "properties": {
+                                "os": {
+                                    "type": "array",
+                                    "items": {
+                                        "properties": {
+                                            "name": {
+                                                "type": "string"
+                                            },
+                                            "version": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "type": "object"
+                                    }
+                                },
+                                "browser": {
+                                    "type": "array",
+                                    "items": {
+                                        "properties": {
+                                            "name": {
+                                                "type": "string"
+                                            },
+                                            "version": {
+                                                "type": "string"
+                                            }
+                                        },
+                                        "type": "object"
+                                    }
+                                },
+                                "user_agent": {
+                                    "type": "string"
+                                }
+                            },
+                            "type": "object"
+                        }
+                    },
+                    "user_id": {
+                        "type": "integer"
+                    },
+                    "occured_at": {
+                        "type": "string"
+                    }
+                },
+                "type": "object"
+            },
+            "settingsEditable": {
+                "properties": {
+                    "key": {
+                        "description": "Class Settings",
+                        "type": "string"
                     },
                     "config": {
-                        "type": "object",
-                        "additionalProperties": "true"
+                        "type": "array",
+                        "items": {
+                            "type": "object"
+                        }
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "helper": {
+                        "type": "string"
+                    },
+                    "group": {
+                        "type": "string"
+                    },
+                    "format": {
+                        "type": "string"
+                    },
+                    "hidden": {
+                        "type": "boolean"
+                    },
+                    "readonly": {
+                        "type": "boolean"
+                    },
+                    "variables": {
+                        "type": "string"
                     },
-                    "sort": {
-                        "type": "integer"
+                    "sansSerifFont": {
+                        "type": "string"
                     }
                 },
                 "type": "object"
             },
-            "SavedSearchChart": {
+            "settings": {
                 "allOf": [
+                    {
+                        "$ref": "#/components/schemas/settingsEditable"
+                    },
                     {
                         "properties": {
                             "id": {
                                 "type": "string",
                                 "format": "id"
                             },
-                            "saved_search_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "user_id": {
-                                "type": "string",
-                                "format": "id"
-                            },
                             "created_at": {
                                 "type": "string",
                                 "format": "date-time"
@@ -11271,68 +7777,172 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
-                            },
-                            "deleted_at": {
-                                "type": "string",
-                                "format": "date-time"
                             }
                         },
                         "type": "object"
-                    },
-                    {
-                        "$ref": "#/components/schemas/SavedSearchChartEditable"
                     }
                 ]
             },
-            "ReportEditable": {
+            "TokenClient": {
                 "properties": {
-                    "type": {
+                    "id": {
+                        "type": "integer"
+                    },
+                    "user_id": {
+                        "type": "integer"
+                    },
+                    "name": {
+                        "type": "string"
+                    },
+                    "provider": {
+                        "type": "string"
+                    },
+                    "redirect": {
+                        "type": "string"
+                    },
+                    "personal_access_client": {
+                        "type": "boolean"
+                    },
+                    "password_client": {
+                        "type": "boolean"
+                    },
+                    "revoked": {
+                        "type": "boolean"
+                    },
+                    "created_at": {
                         "type": "string",
-                        "enum": [
-                            "adhoc",
-                            "scheduled"
-                        ]
+                        "format": "date-time"
                     },
-                    "format": {
+                    "updated_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    }
+                },
+                "type": "object"
+            },
+            "usersEditable": {
+                "properties": {
+                    "email": {
+                        "description": "The attributes that are mass assignable.",
+                        "type": "string",
+                        "format": "email"
+                    },
+                    "firstname": {
+                        "type": "string"
+                    },
+                    "lastname": {
+                        "type": "string"
+                    },
+                    "username": {
+                        "type": "string"
+                    },
+                    "password": {
+                        "type": "string"
+                    },
+                    "address": {
+                        "type": "string"
+                    },
+                    "city": {
+                        "type": "string"
+                    },
+                    "state": {
+                        "type": "string"
+                    },
+                    "postal": {
+                        "type": "string"
+                    },
+                    "country": {
+                        "type": "string"
+                    },
+                    "phone": {
+                        "type": "string"
+                    },
+                    "fax": {
+                        "type": "string"
+                    },
+                    "cell": {
+                        "type": "string"
+                    },
+                    "title": {
+                        "type": "string"
+                    },
+                    "timezone": {
+                        "type": "string"
+                    },
+                    "datetime_format": {
+                        "type": "string"
+                    },
+                    "language": {
+                        "type": "string"
+                    },
+                    "is_administrator": {
+                        "type": "boolean"
+                    },
+                    "expires_at": {
+                        "type": "string"
+                    },
+                    "loggedin_at": {
+                        "type": "string"
+                    },
+                    "remember_token": {
+                        "type": "string"
+                    },
+                    "status": {
                         "type": "string",
                         "enum": [
-                            "csv",
-                            "xlsx"
+                            "ACTIVE",
+                            "INACTIVE",
+                            "SCHEDULED",
+                            "OUT_OF_OFFICE",
+                            "BLOCKED"
                         ]
                     },
-                    "saved_search_id": {
-                        "type": "integer"
+                    "fullname": {
+                        "type": "string"
                     },
-                    "config": {
-                        "type": "object",
-                        "additionalProperties": "true"
+                    "avatar": {
+                        "type": "string"
                     },
-                    "to": {
+                    "media": {
                         "type": "array",
                         "items": {
-                            "type": "string"
+                            "$ref": "#/components/schemas/media"
                         }
                     },
-                    "subject": {
-                        "type": "string"
+                    "birthdate": {
+                        "type": "string",
+                        "format": "date"
                     },
-                    "body": {
-                        "type": "string"
+                    "delegation_user_id": {
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "manager_id": {
+                        "type": "string",
+                        "format": "id"
+                    },
+                    "meta": {
+                        "type": "object",
+                        "additionalProperties": true
+                    },
+                    "force_change_password": {
+                        "type": "boolean"
+                    },
+                    "email_task_notification": {
+                        "type": "boolean"
                     }
                 },
                 "type": "object"
             },
-            "Report": {
+            "users": {
                 "allOf": [
+                    {
+                        "$ref": "#/components/schemas/usersEditable"
+                    },
                     {
                         "properties": {
                             "id": {
-                                "type": "string",
-                                "format": "id"
-                            },
-                            "user_id": {
-                                "type": "string",
-                                "format": "id"
+                                "type": "integer"
                             },
                             "created_at": {
                                 "type": "string",
@@ -11341,63 +7951,53 @@
                             "updated_at": {
                                 "type": "string",
                                 "format": "date-time"
+                            },
+                            "deleted_at": {
+                                "type": "string",
+                                "format": "date-time"
                             }
                         },
                         "type": "object"
-                    },
-                    {
-                        "$ref": "#/components/schemas/SavedSearchEditable"
                     }
                 ]
             },
-            "versionHistoryEditable": {
+            "UserToken": {
                 "properties": {
-                    "versionable_id": {
-                        "description": "Class VersionHistoryCollection",
+                    "id": {
+                        "type": "string"
+                    },
+                    "user_id": {
                         "type": "integer"
                     },
-                    "versionable_type": {
-                        "type": "string"
+                    "client_id": {
+                        "type": "integer"
                     },
                     "name": {
                         "type": "string"
                     },
-                    "subject": {
-                        "type": "string"
+                    "scopes": {
+                        "type": "object"
                     },
-                    "description": {
-                        "type": "string"
+                    "revoked": {
+                        "type": "boolean"
                     },
-                    "status": {
+                    "client": {
+                        "$ref": "#/components/schemas/TokenClient"
+                    },
+                    "created_at": {
                         "type": "string",
-                        "enum": [
-                            "ACTIVE",
-                            "INACTIVE"
-                        ]
+                        "format": "date-time"
+                    },
+                    "updated_at": {
+                        "type": "string",
+                        "format": "date-time"
+                    },
+                    "expires_at": {
+                        "type": "string",
+                        "format": "date-time"
                     }
                 },
                 "type": "object"
-            },
-            "versionHistory": {
-                "type": "object",
-                "allOf": [
-                    {
-                        "$ref": "#/components/schemas/versionHistoryEditable"
-                    },
-                    {
-                        "properties": {
-                            "created_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            },
-                            "updated_at": {
-                                "type": "string",
-                                "format": "date-time"
-                            }
-                        },
-                        "type": "object"
-                    }
-                ]
             }
         },
         "responses": {
@@ -11636,46 +8236,6 @@
         {
             "name": "Processes Variables",
             "description": "Processes Variables"
-        },
-        {
-            "name": "Collections",
-            "description": "Collections"
-        },
-        {
-            "name": "Comments",
-            "description": "Comments"
-        },
-        {
-            "name": "DataSourcesCategories",
-            "description": "DataSourcesCategories"
-        },
-        {
-            "name": "DataSources",
-            "description": "DataSources"
-        },
-        {
-            "name": "DecisionTableCategories",
-            "description": "DecisionTableCategories"
-        },
-        {
-            "name": "DecisionTables",
-            "description": "DecisionTables"
-        },
-        {
-            "name": "SavedSearchCharts",
-            "description": "SavedSearchCharts"
-        },
-        {
-            "name": "SavedSearches",
-            "description": "SavedSearches"
-        },
-        {
-            "name": "Reports",
-            "description": "Reports"
-        },
-        {
-            "name": "Version History",
-            "description": "Version History"
         }
     ],
     "security": [

From f43a71ecd45b6d507b8d8dcc76041202723dd921 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigoquelca@gmail.com>
Date: Mon, 27 Jul 2026 16:16:57 -0400
Subject: [PATCH 31/52] feat(FOUR-32405): add Database Indexes to Improve Saved
 Searches Performance

---
 ..._07_27_000000_add_saved_search_indexes.php | 101 ++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 database/migrations/2026_07_27_000000_add_saved_search_indexes.php

diff --git a/database/migrations/2026_07_27_000000_add_saved_search_indexes.php b/database/migrations/2026_07_27_000000_add_saved_search_indexes.php
new file mode 100644
index 0000000000..765c2693a1
--- /dev/null
+++ b/database/migrations/2026_07_27_000000_add_saved_search_indexes.php
@@ -0,0 +1,101 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Add performance indexes for Saved Search queries.
+     */
+    public function up(): void
+    {
+        $this->addIndex(
+            'process_request_tokens',
+            'process_request_tokens_prt_task_name_id',
+            ['element_type', 'element_name', 'process_id', 'user_id', 'process_request_id']
+        );
+        $this->addIndex(
+            'process_request_tokens',
+            'process_request_tokens_prt_type_id_proc',
+            ['element_type', 'process_id', 'user_id', 'process_request_id']
+        );
+        $this->addIndex(
+            'process_request_tokens',
+            'process_request_tokens_prt_self_service_status_user',
+            ['is_self_service', 'status', 'user_id', 'id']
+        );
+        $this->addIndex(
+            'process_request_tokens',
+            'process_request_tokens_processid_elem_stat_self_user_elname',
+            ['process_id', 'element_type', 'status', 'is_self_service', 'user_id', 'element_name']
+        );
+
+        $this->addIndex(
+            'category_assignments',
+            'category_assignments_assignabletyid_categorytyid',
+            ['assignable_type', 'assignable_id', 'category_type', 'category_id']
+        );
+
+        $this->addIndex(
+            'process_versions',
+            'process_versions_processid_draft',
+            ['process_id', 'draft']
+        );
+
+        // Leading `id` removed from the original proposal because the primary key
+        // already covers it and InnoDB secondary indexes include it automatically.
+        $this->addIndex(
+            'processes',
+            'process_idx_proc_deletedat_categoryid',
+            ['deleted_at', 'process_category_id']
+        );
+
+        // Tail `id` removed for the same reason.
+        $this->addIndex(
+            'process_categories',
+            'process_categories_issystem_id',
+            ['is_system']
+        );
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        $this->dropIndex('process_request_tokens', 'process_request_tokens_prt_task_name_id');
+        $this->dropIndex('process_request_tokens', 'process_request_tokens_prt_type_id_proc');
+        $this->dropIndex('process_request_tokens', 'process_request_tokens_prt_self_service_status_user');
+        $this->dropIndex('process_request_tokens', 'process_request_tokens_processid_elem_stat_self_user_elname');
+        $this->dropIndex('category_assignments', 'category_assignments_assignabletyid_categorytyid');
+        $this->dropIndex('process_versions', 'process_versions_processid_draft');
+        $this->dropIndex('processes', 'process_idx_proc_deletedat_categoryid');
+        $this->dropIndex('process_categories', 'process_categories_issystem_id');
+    }
+
+    private function addIndex(string $table, string $name, array $columns): void
+    {
+        if (Schema::hasIndex($table, $name)) {
+            return;
+        }
+
+        Schema::table($table, function (Blueprint $table) use ($name, $columns) {
+            $table->index($columns, $name);
+        });
+    }
+
+    private function dropIndex(string $table, string $name): void
+    {
+        if (!Schema::hasIndex($table, $name)) {
+            return;
+        }
+
+        try {
+            DB::statement("ALTER TABLE `{$table}` DROP INDEX `{$name}`");
+        } catch (Exception $e) {
+            // Ignore so rollback continues (e.g. index required by a foreign key).
+        }
+    }
+};

From 6714abf2774669063d6aef84a1f12eea392ee8f4 Mon Sep 17 00:00:00 2001
From: Roly Gutierrez <roly.gutierrez@processmaker.com>
Date: Tue, 28 Jul 2026 12:54:09 -0400
Subject: [PATCH 32/52] FOUR-32393 REGRESSION>> The icon main disapperas with
 selections of the options.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Description:
Fix sidebar icon flicker on navigation (FOUR-32393)

Apply .logo-closed styles under #sidebar instead of #sidebar .closed so
the collapsed icon renders at 40×40 before Vue mounts and adds the closed
class. Override [v-cloak] with display: list-item !important so the icon
is not hidden until Vue initializes.

Optimize processmaker-icon.svg (4.7 KB → 1.5 KB) by simplifying structure
and reducing the embedded PNG from 206×206 to 64×64.

Related tickets:
https://processmaker.atlassian.net/browse/FOUR-32393
---
 resources/img/processmaker-icon.svg | 14 +++-----------
 resources/sass/sidebar/sidebar.scss | 21 +++++++++++----------
 2 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/resources/img/processmaker-icon.svg b/resources/img/processmaker-icon.svg
index 944136ba27..50a156dae0 100644
--- a/resources/img/processmaker-icon.svg
+++ b/resources/img/processmaker-icon.svg
@@ -1,11 +1,3 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <rect width="32" height="32" fill="url(#pattern0_27_8533)"/>
-    <defs>
-        <pattern id="pattern0_27_8533" patternContentUnits="objectBoundingBox" width="1" height="1">
-            <use xlink:href="#image0_27_8533" transform="scale(0.00485437)"/>
-        </pattern>
-        <image id="image0_27_8533" width="206" height="206" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAM4AAADOCAYAAAB2Hz3EAAAACXBIWXMAAAsTAAALEwEAmpwYAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8YQUAAAAOdEVYdFNvZnR3YXJlAEZpZ21hnrGWYwAAC1lJREFUeAHt3e11EzkUxvHHnC0AOrglQAehg+0AUgG7FUBK2AoCleAOoIO9HSwdeCVj5c0ez2hGL1fS8z9n4gTyIXb8y9gzkmaHU4fD4cbdfHbbW7e9Rr+p2/Zuu9vtdgq2Kvd88c+RT2776DZB3+3d9s09X76Gf9j5D+5B8GC+YKzUbe+JJz73fBF38x39g3nZF/d8ufOf7NyD8NHd3mPMFMQT1cBoQv75sn/lPvmAcRO3fT89GdhMRHPMvzo77nH+Q9/vaZak4J7nakTz2M7nHpADmE9BPBcjmud5N6/AQgK+bDuLaC5HOM8TEM9DRDMd4ZwnIB6imYlwLicYGA/RzEc40wkGxEM0yyKc6wkGwkM0yyOc+QQD4CGauAhnWYKO8RBNfISzPEGHeIhmXYQTl6AjPESzPsKJT9ABHqLZFuGsS9AwHqLZHuGsT9AgHqJJE+FsS9AQHqJJF+FsT9AAHqJJG+GkSWAYD9Gkj3DSJTCIh2jyRDhpExjCQzT5Ipz0CQzgIZq8EU6eBBXxEE3+CCdfggp4iKZMhJM3QUE8RFMuwsmfoAAeoikb4ZRJkBEP0ZSPcMolyICHaOpEOGUTJMRDNPUinPIJEuAhmroRTp0EG/AQTf0Ip16CFXiIxkaEUzdBBB6isRPh1E+wAA/R2IpwbCS4godo7EU4dhJcwEM0NiMcWwme4CEauxGOvQS/8dyAaMz2B9pq7zZ/nfmfu93uFzrttKe5R+fXJHX301+0+a3bPqK1q58f2ukLBsjdT3Hbv6f77G8FA+R/v4dG8j9vK1ed9nuYd+i8w+X3NIpBrobt7r+/7zcwXktXnf4bnXeYPhBw/PfDGHueOzRSK3ucNwO8p5k7EKAYYM/TwvPR73GagON/TnTaIe6Qs6L/AwZNPB95OLpih/jzNMfvH+Rlm+kIp1KH9Sc3BcRTPcKp0GH7iAAB8VSNcAqXAE1IQDzVIpyCJUQTEhBPlQinUBnQhATEUzzCKVBGNCEB8RSNcDJXAE1IQDzFIpyMFUQTEhBPkQgnUxXQhATEkz3CyVBFNCEB8WSNcBJnAE1IQDzZIpyEGUITEhBPljwcBducQTQhAfGkTP0HD+cb2KYMowkJiCdVe//Bz8fxCyb8gOHVVCzPx2kAzdMUxufzGJ+Pozg9fq9OMyvfgy/ZomsMjU/APc/aFE/+6BwPDpy+IJ6IGkQTEhBPbIoXe+qHo2rEs7yG0YQExLM0xYWXt88ORxPPfB2gCQmIZy7FxHvCs/M4xDNdR2hCAuKZSnHlQMrFE6DEc16HaEIC4nmZYubo4+TIAeJ5rGM0IQHxhBQLDtlfHXJDPENdakNAPIqF57lmx6qNjGcgNCHBuHgUESeHFw3yHBHPgGhCgvHwKCJHVCweHT0SnoHRhATj4FGsGIYUNa1gBDxE85CgfzyKlWP3oufj9IyHaM4S9ItHsWHA66qJbD3iIZrJBP3hUWwcJb56BmhPeIhmNkE/eBQJplZsmjrdAx6iWZygfTyKRPORNq850DIeoolO0C4eRcJJfEkW62gRD9GsTtAeHkXima/JVrlpCQ/RbE7QDh5FhuniSZeHagEP0SRLYB+PItMaC8nXVbOMh2iSJ7CLR5FxYZIsCxJaxEM02RLYw6PIvJpPtpU8LeEhmuwJ7OBRZEbjy7oErgU8RFMsQX08igJofNnXjq6Jh2iKJ6iHR1EIja/Ious18BBNtQTl8SgKovEVu1pBSTxEUz1BOTyKwmh8RS/zUQIP0ZhJkB+PogIaX/Hr4+TEQzTmEuTDo6iExlflwlI58BCN2QTp8SgqovFVuyJbSjxEYz5BOjyKymh8VS9lmAIP0TSTYDsehQE0vurXAN2Ch2iaS7Aej8IIGp+Ji+euwUM0zSaIx6MwhMZn5qrTMXiIpvkEy/EojKHxmbpc+xI8RNNNgnk8CoNofKbg+K7hIZruEkzjURhF4zMHx3cJD9F0m+Acj8IwGp/Zy6D7nmB5D6LpPcXj79k0Gp9pOD6H58bdfHbbDVjv7d1259DsYTyTL9VCpz3Ovdtu0eC6bSwqxe/f832l+TxRmYXz9D1NzclwrEiKx5dnggaWnjIJ59KBAOLpNsX5exqBcTzm4Fw7ekY83aWYPhAgMIzHFJwlh5yJp5sU80fPBEbxmIETc56GeJpPsfyQs8AgHhNw1pzcJJ5mU8SfpxEYw1MdzpYRAcTTXIr1JzcFhvBUhZNiGA3xNJNi+4gAgRE81eCkHHtGPOZTpBtGIzCApwqcHAM2icdsivRjzwSV8RSHk3OUM/GYS5FvwKagIp6icEpMDSAeMynyj3IWVMJTDE7J+TTEUz1FuakBggp4isApiSZEPNVSlJ9PIyiMJzucGmhCxFM8Rb1JaIKCeLLCqYkmRDzFUtSfuSkohCcbHAtoQsSTPYWd6c6CAniywLGEJkQ82VLYWyNAkBlPcjgW0YSIJ3kKuwtrCDLiSQrHMpoQ8SRLYX81GkEmPMngtIAmRDybUzSwhNMpQQY8SeC0hCZEPKtTtIMmJEiMZzOcFtGEiCc6RXtoQoKEeDbBaRlNiHgWp2gXTUiQCM9qOD2gCRHPbIr20YQECfCsgtMTmhDxTKboB01IsBFPNJwe0YSI5yxFf2hCgg14ouD0jCZEPA8p+kUTEqzEsxjOCGhCxDMEmpBgBZ5FcEZCExoYj2IcNCFBJJ5ZOCOiCQ2IRzEempAgAs9VOCOjCQ2ERzEumpBgIZ5JOETz2AB4FEQTEizAcxEO0ZzXMR4F0bxMMIPnDA7RTNchHgXRTCW4gucZHKKZryM8CqKZSzCB5wEO0SyvAzwKolma4AKeIxyiia9hPAqiiU3wAs/OffHa3f6A7enOOxitsT86CuNo3ON5gN3Ube/c4/fL73E+gXua1TW051FwT7M1cdtf/hO/x/F7m7cwnOU9Tsj4nkfRCBrjexzfL/c4vtk18IM2AcdnFI+ioT1NK89HU5drbz2DL9sUfHmWJcJJnCE8CqLJFuFkyAAeBdFkjXAyVRGPgmiyRzgZq4BHQTRFIpzMFcSjIJpiEU6BCuBREE3RCKdQGfEoiKZ4hFOwDHgURFMlwilcQjwKoqkW4VQoAR4F0VSNcCq1AY+CaKpHOBVbgef4/URTvybgnCbbdVkEnuP3EY2NWtnjmJ4vtLUFeI7/3zsa9wfyBo3UCpzP6LwreI7/Psie5gMaqRU4N+6v0Yh4jl+PgOb0+/2IRmpiBuiTvrrtm3si7dFxp5mk9267HeTlmV/34k80kp8B2hqcUVK33eI3HgEzFadO20zx++XZHm0veth1hGMrxZP3NBXm87CFEY6dFBcOBBCPzQjHRoorR8+Ix16EUz/FgkPOxGMrwqmbIuI8DfHYiXDqpVhxcpN4bEQ4dVJsGBFAPPUjnPIpEgyjIZ66EU7ZFAnHnhFPvQinXIoMAzaJp06EUyZFxlHOxFM+wsmfosDUAOIpG+HkTVFwPg3xlItw8qWoMAmNeMpEOHlSVJy5STz5I5z0KQxMdyaevBFO2hSG1gggnnwRTroUBhfWIJ48EU6aFIZXoyGe9BHO9hQNLOFEPGkjnG0pGlr3jHjSRTjrUzS4WCDxpIlw1qVoEE2IeLZHOPEpGkYTIp5tEU5cig7QhIhnfYSzPEVHaELEsy7CWZaiQzQh4omPcOZTdIwmRDxxEc71FAOgCRHP8ghnOsVAaELEsyzCuZxiQDQh4pmPcM5TDIwmRDzXI5znKYjmIeKZjnAeUxDNWcRzOQ/nF5iCaCYjnvM8nJ8YOwXRzEY8Dx29eDh3GDcF0SyOeI794z+8Ol3deEQ8CqKJbnA8d+7+f/WfHA8OuC++uJtbt+3Rf/49nf+r8Y5o1vUEzzeMAWjvttuTE8bY2v4HPyd2OQ1Dn9wAAAAASUVORK5CYII="/>
-    </defs>
-</svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" width="32" height="32" viewBox="0 0 32 32">
+  <image width="32" height="32" href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAEAAAABACAQAAAAAYLlVAAAD20lEQVRo3q2Zz0tUURTHv2+cdAgcMxTatMpioISkVYv+ijZCDtImKImwTYGroJbSaDSLIEjMRYtaabR0DCxoEQRuwlpFmDMJ4saccb4t3vx4P+6579775rj0eb8fzr33fM89gq94yKSo8yWHCIJICv8rjvMzk2OX0zCQ9xFKHExGaMkXWKFZfABNo8FFH8FAfsN41Yo5QACBvZIn120AtAhO8tYAIoKjvAOA8iw4yzsBxLKQQt4RIISQSt4ZIIrgKp8CIIjgLp8KgCTLzPMiN1OssO5RLm0/8B1NTeHz8A8VjGIioT4P4DJGhN9VsuKf/cQkvsLTLHyMSyhjC1PYR0bzXQZFPMeAVL+leM++0DmP//h73+BC5EbEf8a4I22BnIEmPCgT0Mp3AS9wDUAfZuBhDgf+rojfi+mxjIg8APThDp5gUCPm9QxAIW+GIB7kDOqp5dMgHGWwhEZqeVeEKpbBIZbYUJzPVWatHU/ZNRE8r7wFVRbpgeAgFxUIIQDjmq/oFwSAKosEW0urEAIAVpYTQ1AC1Hx5dhaPI3QArB0v3i9EAaod+YBAFKEF4GS4IYQYQFg+ABFGWGU2hd+H+4UggEpemYUugJvfBxG6AGp5JUIbwL3d6CK0AWqivALBB0jT7XQRfICqVj5yFsg1einl2wgneY67/GsgH8hCme84nlreR3jKK/zGabPXdRshz3v8yN5Eg8u8LslLdnwWo9jCMXoRe9hGAXkjm+pcvE2ucZgLSpuyiypv8AJ/8ZnBfCF071eZEWzKTr5IcIx/2EycL0TKjn8N0yG0L55/DfXzhVjVaxcid4RO2ekUIhlBUXS7pdgNoVN2QqVYjaCs+UEzskcIVL2IGcW7JsFywnZshxAqujE7DmdBdLxoQ2KOELEcRUMSRBAdL96SmSHEHE/ZknU3QnQ8VVOajKBwPKEpbSGA48JUM9KWwwRBabhiW95giUPgJ2ExNYAOQfB7EYCs87H8PI8BJCCI3Y4GgKxYPU5bj9wDzKEcccoaZrGc8BBWFmDL17GAUMN9J3mX+YACQSvfKTZCyBOSHDLaBuIAD3GMu9jDLFYSZiH9so4MMIEpbGiz2sRrjGAbXzCm+Yroxy0MixnVjOkOsZ+wfTt4hAJu44QmVUQWp8Wt1ozpgBxyCb3ePN4ijzOYcTh9iWM6c79P0zU5j2prgXYjDYIjQLjdSIPgBFCN+b07ggOA5HhuCNYAsuO5IVgCaN73jghWAAnveycECwCT8YI9QgViqxD9P7fJeKGbhRLrRuu+8XgTk8hpV/ZwhCWsgCZ+31roFB7gaqKz/8b8fzaM+zxV9GbRAAAAAElFTkSuQmCC"/>
+</svg>
diff --git a/resources/sass/sidebar/sidebar.scss b/resources/sass/sidebar/sidebar.scss
index 31d4cfa646..b67b2ad1e5 100644
--- a/resources/sass/sidebar/sidebar.scss
+++ b/resources/sass/sidebar/sidebar.scss
@@ -72,6 +72,17 @@
     width: 150px;
   }
 
+  .logo-closed {
+    display: list-item !important;
+    margin: 16px auto 24px auto;
+  }
+
+  .logo-closed img {
+    margin: 0px 9px;
+    height: 40px;
+    width: 40px;
+  }
+
   .nav-item:hover {
     background-color: $hover;
   }
@@ -89,16 +100,6 @@
     color: $light;
   }
 
-  .logo-closed {
-    margin: 16px auto 24px auto;
-  }
-
-  .logo-closed img {
-    margin: 0px 9px;
-    height: 40px;
-    width: 40px;
-  }
-
   .nav-item:hover {
     background-color: $hover;
   }

From 6a0abd2d4a2377e37d7917f1f85723febd46b885 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Wed, 29 Jul 2026 12:56:45 -0400
Subject: [PATCH 33/52] fix: screen were not properly exporting dependant
 collections and data sources

---
 ProcessMaker/Assets/DataSourcesInProcess.php  |  72 ++++++++++
 ProcessMaker/Assets/DataSourcesInScreen.php   | 129 ++++++++++++++++++
 ProcessMaker/Assets/ScriptsInProcess.php      |   8 +-
 ProcessMaker/Assets/ScriptsInScreen.php       |  13 +-
 ProcessMaker/Jobs/ExportProcess.php           |  32 +++++
 ProcessMaker/Jobs/ExportScreen.php            |   1 +
 .../Providers/WorkflowServiceProvider.php     |   4 +
 ...rocessExporterWithScreenDataSourceTest.php |  98 +++++++++++++
 .../ScriptsInScreenDataSourceTest.php         | 116 ++++++++++++++++
 9 files changed, 468 insertions(+), 5 deletions(-)
 create mode 100644 ProcessMaker/Assets/DataSourcesInProcess.php
 create mode 100644 ProcessMaker/Assets/DataSourcesInScreen.php
 create mode 100644 tests/Feature/ImportExport/Exporters/ProcessExporterWithScreenDataSourceTest.php
 create mode 100644 tests/Feature/ImportExport/Exporters/ScriptsInScreenDataSourceTest.php

diff --git a/ProcessMaker/Assets/DataSourcesInProcess.php b/ProcessMaker/Assets/DataSourcesInProcess.php
new file mode 100644
index 0000000000..0a44452214
--- /dev/null
+++ b/ProcessMaker/Assets/DataSourcesInProcess.php
@@ -0,0 +1,72 @@
+<?php
+
+namespace ProcessMaker\Assets;
+
+use DOMXPath;
+use ProcessMaker\Models\Process;
+use ProcessMaker\Providers\WorkflowServiceProvider;
+
+class DataSourcesInProcess
+{
+    public $type = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSource';
+
+    public $owner = Process::class;
+
+    /**
+     * Get the data sources used in a process
+     *
+     * @param Process $process
+     * @param array $dataSources
+     *
+     * @return array
+     */
+    public function referencesToExport(Process $process, array $dataSources = [])
+    {
+        // Data Sources used in BPMN Service Tasks
+        $xpath = new DOMXPath($process->getDefinitions());
+        $xpath->registerNamespace('pm', WorkflowServiceProvider::PROCESS_MAKER_NS);
+        
+        // Find all nodes with pm:config
+        $nodes = $xpath->query("//*[@pm:config!='']");
+        foreach ($nodes as $node) {
+            $configString = $node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'config');
+            $config = json_decode($configString, true);
+            if (isset($config['dataSource']) && is_numeric($config['dataSource'])) {
+                $dataSources[] = [$this->type, (int) $config['dataSource']];
+            }
+        }
+
+        return $dataSources;
+    }
+
+    /**
+     * Update references used in an imported process
+     *
+     * @param Process $process
+     * @param array $references
+     *
+     * @return void
+     */
+    public function updateReferences(Process $process, array $references = [])
+    {
+        $definitions = $process->getDefinitions();
+        $xpath = new DOMXPath($definitions);
+        $xpath->registerNamespace('pm', WorkflowServiceProvider::PROCESS_MAKER_NS);
+
+        $nodes = $xpath->query("//*[@pm:config!='']");
+        foreach ($nodes as $node) {
+            $configString = $node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'config');
+            $config = json_decode($configString, true);
+            if (isset($config['dataSource']) && is_numeric($config['dataSource'])) {
+                $oldRef = $config['dataSource'];
+                if (isset($references[$this->type][$oldRef])) {
+                    $newRef = $references[$this->type][$oldRef]->getKey();
+                    $config['dataSource'] = $newRef;
+                    $node->setAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'config', json_encode($config));
+                }
+            }
+        }
+        $process->bpmn = $definitions->saveXML();
+        $process->save();
+    }
+}
diff --git a/ProcessMaker/Assets/DataSourcesInScreen.php b/ProcessMaker/Assets/DataSourcesInScreen.php
new file mode 100644
index 0000000000..bebb322c95
--- /dev/null
+++ b/ProcessMaker/Assets/DataSourcesInScreen.php
@@ -0,0 +1,129 @@
+<?php
+
+namespace ProcessMaker\Assets;
+
+use ProcessMaker\Managers\ExportManager;
+use ProcessMaker\Models\Screen;
+
+class DataSourcesInScreen
+{
+    public $type = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSource';
+
+    public $owner = Screen::class;
+
+    /**
+     * Get the data sources (ex. watchers) used in a screen
+     *
+     * @param Screen $screen
+     * @param array $dataSources
+     *
+     * @return array
+     */
+    public function referencesToExport(Screen $screen, array $dataSources = [])
+    {
+        $watchers = $screen->watchers;
+        if (is_array($watchers)) {
+            $this->findInArray($watchers, function ($item) use (&$dataSources) {
+                if (is_array($item)) {
+                    $scriptId = (string) ($item['script_id'] ?? '');
+                    $id = (string) ($item['script']['id'] ?? '');
+                    if (str_starts_with($scriptId, 'data_source-') || str_starts_with($id, 'data_source-')) {
+                        $numericId = str_replace('data_source-', '', str_starts_with($scriptId, 'data_source-') ? $scriptId : $id);
+                        if (is_numeric($numericId)) {
+                            $dataSources[] = [$this->type, (int) $numericId];
+                        }
+                    }
+                }
+            });
+        }
+
+        $config = $screen->versionFor(null)->config;
+        if (is_array($config)) {
+            $this->findInArray($config, function ($item) use (&$dataSources) {
+                if (is_array($item) && isset($item['component']) && $item['component'] === 'FormSelectList' && !empty($item['config']['options']['selectedDataSource'])) {
+                    $dataSources[] = [$this->type, (int) $item['config']['options']['selectedDataSource']];
+                }
+            });
+        }
+
+        return $dataSources;
+    }
+
+    /**
+     * Update references used in an imported screen
+     *
+     * @param Screen $screen
+     * @param array $references
+     * @param ExportManager $exportManager
+     *
+     * @return void
+     */
+    public function updateReferences(Screen $screen, array $references, ExportManager $exportManager)
+    {
+        $watches = $screen->watchers;
+        if (is_array($watches)) {
+            foreach ($watches as &$watcher) {
+                $id = (string) ($watcher['script']['id'] ?? '');
+                if (str_starts_with($id, 'data_source-')) {
+                    $oldRef = str_replace('data_source-', '', $id);
+                    if (isset($references[$this->type][$oldRef])) {
+                        $newRef = $references[$this->type][$oldRef]->getKey();
+                    } else {
+                        $newRef = null;
+                        $exportManager->addLogMessage(
+                            'DataSourcesInScreen:references',
+                            __(
+                                'Imported file does not contain the data source #:dataSource assigned to a watcher',
+                                ['dataSource' => $oldRef]
+                            ),
+                            false,
+                            __("Missing watcher's data source")
+                        );
+                    }
+                    if ($newRef) {
+                        $watcher['script_id'] = $newRef;
+                        $watcher['script']['id'] = "data_source-$newRef";
+                        $watcher['script']['title'] = $references[$this->type][$oldRef]->name;
+                    }
+                }
+            }
+        }
+        $screen->watchers = $watches;
+
+        $config = $screen->config;
+        if (is_array($config)) {
+            $this->findInArray($config, function ($item, $key) use ($references, &$config) {
+                if (is_array($item) && isset($item['component']) && $item['component'] === 'FormSelectList' && !empty($item['config']['options']['selectedDataSource'])) {
+                    $oldRef = $item['config']['options']['selectedDataSource'];
+                    if (isset($references[$this->type][$oldRef])) {
+                        $newRef = $references[$this->type][$oldRef]->getKey();
+                        Arr::set($config, "$key.config.options.selectedDataSource", $newRef);
+                    }
+                }
+            });
+            $screen->config = $config;
+        }
+
+        $screen->save();
+    }
+
+    /**
+     * Find recursively in an array
+     *
+     * @param array $array
+     * @param callable $callback
+     *
+     * @return void
+     */
+    private function findInArray(array $array, callable $callback)
+    {
+        call_user_func($callback, $array);
+        foreach ($array as $item) {
+            if (is_array($item)) {
+                $this->findInArray($item, $callback);
+            } else {
+                call_user_func($callback, $item);
+            }
+        }
+    }
+}
diff --git a/ProcessMaker/Assets/ScriptsInProcess.php b/ProcessMaker/Assets/ScriptsInProcess.php
index 5b36ff0dfa..0886099bde 100644
--- a/ProcessMaker/Assets/ScriptsInProcess.php
+++ b/ProcessMaker/Assets/ScriptsInProcess.php
@@ -30,7 +30,10 @@ public function referencesToExport(Process $process, array $scripts = [])
         // Used in scriptRef
         $nodes = $xpath->query("//*[@pm:scriptRef!='']");
         foreach ($nodes as $node) {
-            $scripts[] = [Script::class, $node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'scriptRef')];
+            $scriptId = $node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'scriptRef');
+            if (!str_starts_with((string) $scriptId, 'data_source-')) {
+                $scripts[] = [Script::class, $scriptId];
+            }
         }
 
         return $scripts;
@@ -54,6 +57,9 @@ public function updateReferences(Process $process, array $references = [])
         $nodes = $xpath->query("//*[@pm:scriptRef!='']");
         foreach ($nodes as $node) {
             $oldRef = $node->getAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'scriptRef');
+            if (str_starts_with((string) $oldRef, 'data_source-')) {
+                continue;
+            }
             $newRef = $references[Script::class][$oldRef]->getKey();
             $node->setAttributeNS(WorkflowServiceProvider::PROCESS_MAKER_NS, 'scriptRef', $newRef);
         }
diff --git a/ProcessMaker/Assets/ScriptsInScreen.php b/ProcessMaker/Assets/ScriptsInScreen.php
index 9cf41025dd..da71a1919e 100644
--- a/ProcessMaker/Assets/ScriptsInScreen.php
+++ b/ProcessMaker/Assets/ScriptsInScreen.php
@@ -26,7 +26,11 @@ public function referencesToExport(Screen $screen, array $scripts = [])
         if (is_array($config)) {
             $this->findInArray($config, function ($item) use (&$scripts) {
                 if (is_array($item) && !empty($item['script_id'])) {
-                    $scripts[] = [Script::class, $item['script_id']];
+                    $scriptId = (string) $item['script_id'];
+                    $id = (string) ($item['script']['id'] ?? '');
+                    if (!str_starts_with($scriptId, 'data_source-') && !str_starts_with($id, 'data_source-')) {
+                        $scripts[] = [Script::class, $item['script_id']];
+                    }
                 }
             });
         }
@@ -47,11 +51,12 @@ public function updateReferences(Screen $screen, array $references, ExportManage
         $watches = $screen->watchers;
         if (is_array($watches)) {
             foreach ($watches as &$watcher) {
-                $refParts = explode('-', $watcher['script_id']);
-                if ($refParts[0] === 'data_source') {
+                $scriptId = (string) ($watcher['script_id'] ?? '');
+                $id = (string) ($watcher['script']['id'] ?? '');
+                if (str_starts_with($scriptId, 'data_source-') || str_starts_with($id, 'data_source-')) {
                     continue;
                 }
-                $oldRef = $refParts[1];
+                $oldRef = $scriptId;
                 if (isset($references[Script::class][$oldRef])) {
                     $newRef = $references[Script::class][$oldRef]->getKey();
                 } else {
diff --git a/ProcessMaker/Jobs/ExportProcess.php b/ProcessMaker/Jobs/ExportProcess.php
index f7f03ecf8a..116a6c8ed2 100644
--- a/ProcessMaker/Jobs/ExportProcess.php
+++ b/ProcessMaker/Jobs/ExportProcess.php
@@ -217,6 +217,37 @@ public function packageScripts()
         }
     }
 
+    /**
+     * Package any data sources referred to in our screen or process.
+     *
+     * @return void
+     */
+    public function packageDataSources()
+    {
+        $this->package['data_sources'] = [];
+        $dataSourceClass = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSource';
+
+        if (!class_exists($dataSourceClass)) {
+            return;
+        }
+
+        if (!isset($this->screen)) {
+            $dataSourceIds = $this->manager->getDependenciesOfType($dataSourceClass, $this->process, []);
+        } else {
+            $dataSourceIds = $this->manager->getDependenciesOfType($dataSourceClass, $this->screen, []);
+        }
+
+        if (count($dataSourceIds)) {
+            $dataSources = $dataSourceClass::whereIn('id', $dataSourceIds)->get();
+
+            $dataSources->each(function ($dataSource) {
+                $dataSourceArray = $dataSource->toArray();
+                $dataSourceArray['categories'] = $dataSource->categories->toArray();
+                $this->package['data_sources'][] = $dataSourceArray;
+            });
+        }
+    }
+
     /**
      * Package the metadata (NOT THE VALUE) of any environment variables
      * referred to in our scripts.
@@ -253,6 +284,7 @@ private function packageFile()
         $this->packageProcessCategory();
         $this->packageScreens();
         $this->packageScripts();
+        $this->packageDataSources();
         $this->packageEnvironmentVariables();
     }
 
diff --git a/ProcessMaker/Jobs/ExportScreen.php b/ProcessMaker/Jobs/ExportScreen.php
index 7bf930323b..3702a63331 100644
--- a/ProcessMaker/Jobs/ExportScreen.php
+++ b/ProcessMaker/Jobs/ExportScreen.php
@@ -38,6 +38,7 @@ private function packageFile()
         $this->package['version'] = '2';
         $this->packageScreens();
         $this->packageScripts();
+        $this->packageDataSources();
     }
 
     /**
diff --git a/ProcessMaker/Providers/WorkflowServiceProvider.php b/ProcessMaker/Providers/WorkflowServiceProvider.php
index 7bdbc78c28..fffbff740f 100644
--- a/ProcessMaker/Providers/WorkflowServiceProvider.php
+++ b/ProcessMaker/Providers/WorkflowServiceProvider.php
@@ -9,6 +9,8 @@
 use ProcessMaker\Assets\ScreensInScreen;
 use ProcessMaker\Assets\ScriptsInProcess;
 use ProcessMaker\Assets\ScriptsInScreen;
+use ProcessMaker\Assets\DataSourcesInScreen;
+use ProcessMaker\Assets\DataSourcesInProcess;
 use ProcessMaker\Bpmn\MustacheOptions;
 use ProcessMaker\BpmnEngine;
 use ProcessMaker\Contracts\TimerExpressionInterface;
@@ -195,6 +197,8 @@ function (ThrowEventInterface $source, EventDefinitionInterface $sourceEventDefi
             $instance->addDependencyManager(ScreensInScreen::class);
             $instance->addDependencyManager(ScriptsInProcess::class);
             $instance->addDependencyManager(ScriptsInScreen::class);
+            $instance->addDependencyManager(DataSourcesInScreen::class);
+            $instance->addDependencyManager(DataSourcesInProcess::class);
 
             return $instance;
         });
diff --git a/tests/Feature/ImportExport/Exporters/ProcessExporterWithScreenDataSourceTest.php b/tests/Feature/ImportExport/Exporters/ProcessExporterWithScreenDataSourceTest.php
new file mode 100644
index 0000000000..f02fc39898
--- /dev/null
+++ b/tests/Feature/ImportExport/Exporters/ProcessExporterWithScreenDataSourceTest.php
@@ -0,0 +1,98 @@
+<?php
+
+namespace Tests\Feature\ImportExport\Exporters;
+
+use ProcessMaker\Jobs\ExportProcess;
+use ProcessMaker\Models\Process;
+use ProcessMaker\Models\Screen;
+use ProcessMaker\Models\Script;
+use Tests\TestCase;
+
+class ProcessExporterWithScreenDataSourceTest extends TestCase
+{
+    /**
+     * Test that Process export with a Screen using a Data Source
+     * correctly identifies the Data Source and not as a Script.
+     */
+    public function testProcessExportWithScreenDataSource()
+    {
+        $dataSourceClass = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSource';
+        $dataSourceCategoryClass = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSourceCategory';
+        if (!class_exists($dataSourceClass) || !class_exists($dataSourceCategoryClass)) {
+            $this->markTestSkipped('DataSource package not installed');
+        }
+
+        // Create a script first to consume some IDs
+        $script = Script::factory()->create(['title' => 'A Script']);
+        
+        $category = new $dataSourceCategoryClass();
+        $category->name = 'Test Category ' . uniqid();
+        $category->save();
+
+        $dataSource = new $dataSourceClass();
+        $dataSource->name = 'Test Data Source ' . uniqid();
+        $dataSource->description = 'Description';
+        $dataSource->data_source_category_id = $category->id;
+        $dataSource->save();
+
+        // Let's try to make a script with the same ID as the data source
+        // This might be tricky due to auto-increment, but we can try to force it or just use a high ID
+        $duplicateScript = null;
+        try {
+            $duplicateScript = Script::factory()->create(['id' => $dataSource->id, 'title' => 'Duplicate ID Script']);
+        } catch (\Exception $e) {
+            // If ID is already taken, just create one normally
+            $duplicateScript = Script::factory()->create(['title' => 'Other Script']);
+        }
+
+        $screen = Screen::factory()->create([
+            'title' => 'Screen with data source watcher',
+            'watchers' => [
+                [
+                    'name' => 'Data Source Watcher',
+                    'script_id' => 'data_source-' . $dataSource->id,
+                    'script' => [
+                        'id' => 'data_source-' . $dataSource->id,
+                        'title' => 'My Data Source',
+                    ],
+                ],
+            ],
+        ]);
+
+        $bpmn = '<?xml version="1.0" encoding="UTF-8"?>
+<bpmn:definitions xmlns:bpmn="http://www.omg.org/spec/BPMN/20100524/MODEL" xmlns:pm="http://processmaker.com/BPMN/2.0/Schema.xsd" id="Definitions_1" targetNamespace="http://bpmn.io/schema/bpmn">
+  <bpmn:process id="Process_1" isExecutable="false">
+    <bpmn:startEvent id="StartEvent_1" pm:screenRef="' . $screen->id . '" />
+  </bpmn:process>
+</bpmn:definitions>';
+
+        $process = Process::factory()->create([
+            'name' => 'Process with screen using data source',
+            'bpmn' => $bpmn
+        ]);
+
+        $exportJob = new ExportProcess($process);
+        $exportJob->handle();
+        
+        // Access private package property via reflection
+        $reflection = new \ReflectionClass($exportJob);
+        $property = $reflection->getProperty('package');
+        $property->setAccessible(true);
+        $package = $property->getValue($exportJob);
+
+        // Check if data source is in package
+        $this->assertArrayHasKey('data_sources', $package);
+        $this->assertCount(1, $package['data_sources']);
+        $this->assertEquals($dataSource->id, $package['data_sources'][0]['id']);
+
+        // Check that it is NOT in scripts
+        foreach ($package['scripts'] as $script) {
+            $this->assertNotEquals('data_source-' . $dataSource->id, $script['id']);
+            $this->assertNotEquals($dataSource->id, $script['id']);
+            // Also check that it's not present as a numeric ID if it's the same
+            if (is_numeric($script['id']) && (int)$script['id'] === $dataSource->id) {
+                $this->fail('Data source ID ' . $dataSource->id . ' found in scripts section');
+            }
+        }
+    }
+}
diff --git a/tests/Feature/ImportExport/Exporters/ScriptsInScreenDataSourceTest.php b/tests/Feature/ImportExport/Exporters/ScriptsInScreenDataSourceTest.php
new file mode 100644
index 0000000000..f22ac082ce
--- /dev/null
+++ b/tests/Feature/ImportExport/Exporters/ScriptsInScreenDataSourceTest.php
@@ -0,0 +1,116 @@
+<?php
+
+namespace Tests\Feature\ImportExport\Exporters;
+
+use ProcessMaker\Assets\DataSourcesInScreen;
+use ProcessMaker\Assets\ScriptsInScreen;
+use ProcessMaker\Models\Screen;
+use ProcessMaker\Models\Script;
+use ProcessMaker\Jobs\ExportScreen;
+use Tests\TestCase;
+
+class ScriptsInScreenDataSourceTest extends TestCase
+{
+    /**
+     * Test that ScriptsInScreen does not identify data_source- prefixed IDs as scripts.
+     */
+    public function testReferencesToExportWithDataSource()
+    {
+        $screen = Screen::factory()->create([
+            'title' => 'Screen with data source watcher',
+            'watchers' => [
+                [
+                    'name' => 'Data Source Watcher',
+                    'script_id' => 'data_source-3',
+                    'script' => [
+                        'id' => 'data_source-3',
+                        'title' => 'My Data Source',
+                    ],
+                ],
+            ],
+        ]);
+
+        $scriptsInScreen = new ScriptsInScreen();
+        $scripts = $scriptsInScreen->referencesToExport($screen);
+
+        // After the fix, this should be 0 because the only watcher is a data source
+        $this->assertCount(0, $scripts, 'Should not identify data_source as a script');
+    }
+
+    /**
+     * Test that DataSourcesInScreen identifies data_source- prefixed IDs as data sources.
+     */
+    public function testReferencesToExportWithDataSourceAsset()
+    {
+        $screen = Screen::factory()->create([
+            'title' => 'Screen with data source watcher',
+            'watchers' => [
+                [
+                    'name' => 'Data Source Watcher',
+                    'script_id' => 'data_source-3',
+                    'script' => [
+                        'id' => 'data_source-3',
+                        'title' => 'My Data Source',
+                    ],
+                ],
+            ],
+        ]);
+
+        $dataSourcesInScreen = new DataSourcesInScreen();
+        $dataSources = $dataSourcesInScreen->referencesToExport($screen);
+
+        $this->assertCount(1, $dataSources);
+        $this->assertEquals('ProcessMaker\Packages\Connectors\DataSources\Models\DataSource', $dataSources[0][0]);
+        $this->assertEquals(3, $dataSources[0][1]);
+    }
+
+    /**
+     * Test that ExportScreen includes data sources in the package.
+     */
+    public function testExportScreenIncludesDataSources()
+    {
+        $dataSourceClass = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSource';
+        $dataSourceCategoryClass = 'ProcessMaker\Packages\Connectors\DataSources\Models\DataSourceCategory';
+        if (!class_exists($dataSourceClass) || !class_exists($dataSourceCategoryClass)) {
+            $this->markTestSkipped('DataSource package not installed');
+        }
+
+        $category = new $dataSourceCategoryClass();
+        $category->name = 'Test Category';
+        $category->save();
+
+        $dataSource = new $dataSourceClass();
+        $dataSource->name = 'Test Data Source';
+        $dataSource->description = 'Description';
+        $dataSource->data_source_category_id = $category->id;
+        $dataSource->save();
+
+        $screen = Screen::factory()->create([
+            'title' => 'Screen with data source watcher',
+            'watchers' => [
+                [
+                    'name' => 'Data Source Watcher',
+                    'script_id' => 'data_source-' . $dataSource->id,
+                    'script' => [
+                        'id' => 'data_source-' . $dataSource->id,
+                        'title' => 'My Data Source',
+                    ],
+                ],
+            ],
+        ]);
+
+        $exportJob = new ExportScreen($screen);
+        $exportJob->handle();
+        
+        // Access private package property via reflection
+        $reflection = new \ReflectionClass($exportJob);
+        // package is protected in ExportProcess
+        $property = $reflection->getParentClass()->getProperty('package');
+        $property->setAccessible(true);
+        $package = $property->getValue($exportJob);
+
+        $this->assertArrayHasKey('data_sources', $package);
+        $this->assertCount(1, $package['data_sources']);
+        $this->assertEquals($dataSource->id, $package['data_sources'][0]['id']);
+    }
+}

From b80d225dfb13e038fc83f78cab22e17c3117dfa5 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Wed, 29 Jul 2026 15:00:29 -0400
Subject: [PATCH 34/52] fix: add missing Illuminate\Support\Arr import in
 DataSourcesInScreen asset

The asset class uses Arr::set for updating references but was missing the import,
causing a runtime error during the import process.
---
 ProcessMaker/Assets/DataSourcesInScreen.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/ProcessMaker/Assets/DataSourcesInScreen.php b/ProcessMaker/Assets/DataSourcesInScreen.php
index bebb322c95..19bc000ae9 100644
--- a/ProcessMaker/Assets/DataSourcesInScreen.php
+++ b/ProcessMaker/Assets/DataSourcesInScreen.php
@@ -4,6 +4,7 @@
 
 use ProcessMaker\Managers\ExportManager;
 use ProcessMaker\Models\Screen;
+use Illuminate\Support\Arr;
 
 class DataSourcesInScreen
 {

From 72a14a7902e86ec71809a2e787165dbc207c4265 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Wed, 29 Jul 2026 16:14:08 -0400
Subject: [PATCH 35/52] fix: include path tracking for improved callback
 context

---
 ProcessMaker/Assets/DataSourcesInScreen.php | 15 ++++++++-------
 ProcessMaker/Assets/ScriptsInScreen.php     | 11 ++++++-----
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ProcessMaker/Assets/DataSourcesInScreen.php b/ProcessMaker/Assets/DataSourcesInScreen.php
index 19bc000ae9..4a7494d74f 100644
--- a/ProcessMaker/Assets/DataSourcesInScreen.php
+++ b/ProcessMaker/Assets/DataSourcesInScreen.php
@@ -93,12 +93,12 @@ public function updateReferences(Screen $screen, array $references, ExportManage
 
         $config = $screen->config;
         if (is_array($config)) {
-            $this->findInArray($config, function ($item, $key) use ($references, &$config) {
+            $this->findInArray($config, function ($item, $keyDotNotation) use ($references, &$config) {
                 if (is_array($item) && isset($item['component']) && $item['component'] === 'FormSelectList' && !empty($item['config']['options']['selectedDataSource'])) {
                     $oldRef = $item['config']['options']['selectedDataSource'];
                     if (isset($references[$this->type][$oldRef])) {
                         $newRef = $references[$this->type][$oldRef]->getKey();
-                        Arr::set($config, "$key.config.options.selectedDataSource", $newRef);
+                        Arr::set($config, "$keyDotNotation.config.options.selectedDataSource", $newRef);
                     }
                 }
             });
@@ -113,17 +113,18 @@ public function updateReferences(Screen $screen, array $references, ExportManage
      *
      * @param array $array
      * @param callable $callback
+     * @param array $path
      *
      * @return void
      */
-    private function findInArray(array $array, callable $callback)
+    private function findInArray(array $array, callable $callback, array $path = [])
     {
-        call_user_func($callback, $array);
-        foreach ($array as $item) {
+        call_user_func($callback, $array, implode('.', $path));
+        foreach ($array as $key => $item) {
             if (is_array($item)) {
-                $this->findInArray($item, $callback);
+                $this->findInArray($item, $callback, array_merge($path, [$key]));
             } else {
-                call_user_func($callback, $item);
+                call_user_func($callback, $item, implode('.', array_merge($path, [$key])));
             }
         }
     }
diff --git a/ProcessMaker/Assets/ScriptsInScreen.php b/ProcessMaker/Assets/ScriptsInScreen.php
index da71a1919e..1d6be01ac9 100644
--- a/ProcessMaker/Assets/ScriptsInScreen.php
+++ b/ProcessMaker/Assets/ScriptsInScreen.php
@@ -87,17 +87,18 @@ public function updateReferences(Screen $screen, array $references, ExportManage
      *
      * @param array $array
      * @param callable $callback
+     * @param array $path
      *
      * @return void
      */
-    private function findInArray(array $array, callable $callback)
+    private function findInArray(array $array, callable $callback, array $path = [])
     {
-        call_user_func($callback, $array);
-        foreach ($array as $item) {
+        call_user_func($callback, $array, implode('.', $path));
+        foreach ($array as $key => $item) {
             if (is_array($item)) {
-                $this->findInArray($item, $callback);
+                $this->findInArray($item, $callback, array_merge($path, [$key]));
             } else {
-                call_user_func($callback, $item);
+                call_user_func($callback, $item, implode('.', array_merge($path, [$key])));
             }
         }
     }

From f2f9464d1f2792fec463739d76670d44042d9d38 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Mon, 3 Aug 2026 13:59:02 -0400
Subject: [PATCH 36/52] fix: update watcher script_id assignment to remove
 prefix for consistency

---
 ProcessMaker/Jobs/ImportProcess.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ProcessMaker/Jobs/ImportProcess.php b/ProcessMaker/Jobs/ImportProcess.php
index 51ca215d7c..03b4768916 100644
--- a/ProcessMaker/Jobs/ImportProcess.php
+++ b/ProcessMaker/Jobs/ImportProcess.php
@@ -990,7 +990,7 @@ protected function watcherScriptsToSave($screen)
         $watcherList = [];
         foreach ($screen->watchers as $watcher) {
             $script = $watcher->script;
-            $watcher->script_id = $script->id;
+            $watcher->script_id = str_replace(['script-', 'data_source-'], '', $script->id);
             $watcher->script->title = $script->title;
             $watcherList[] = $watcher;
         }

From 37212a1631e47fe93c9c757188328c069726c4b6 Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Mon, 3 Aug 2026 14:33:26 -0700
Subject: [PATCH 37/52] Update security advisory

---
 composer.json |  2 +-
 composer.lock | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/composer.json b/composer.json
index 1d700325d8..d0a66693b0 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,7 @@
         "fakerphp/faker": "^1.24",
         "google/apiclient": "^2.18",
         "google/protobuf": "^4.33.6",
-        "guzzlehttp/guzzle": "^7.13.1",
+        "guzzlehttp/guzzle": "^7.15.2",
         "guzzlehttp/psr7": "^2.12.3",
         "igaster/laravel-theme": "^2.0",
         "jenssegers/agent": "^2.6",
diff --git a/composer.lock b/composer.lock
index 69114017d6..7424e10bfa 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "16713528d4523a3285c6fd02776afcb3",
+    "content-hash": "39e08dd682bb95515f53d495a677b313",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -2283,16 +2283,16 @@
         },
         {
             "name": "guzzlehttp/guzzle",
-            "version": "7.15.1",
+            "version": "7.15.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/guzzle/guzzle.git",
-                "reference": "61443dfb33c62f308ee8add20f45b4d6e4bf8d2f"
+                "reference": "744101956d78b7c1384d0cbf379db13e859167bf"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/61443dfb33c62f308ee8add20f45b4d6e4bf8d2f",
-                "reference": "61443dfb33c62f308ee8add20f45b4d6e4bf8d2f",
+                "url": "https://api.github.com/repos/guzzle/guzzle/zipball/744101956d78b7c1384d0cbf379db13e859167bf",
+                "reference": "744101956d78b7c1384d0cbf379db13e859167bf",
                 "shasum": ""
             },
             "require": {
@@ -2391,7 +2391,7 @@
             ],
             "support": {
                 "issues": "https://github.com/guzzle/guzzle/issues",
-                "source": "https://github.com/guzzle/guzzle/tree/7.15.1"
+                "source": "https://github.com/guzzle/guzzle/tree/7.15.2"
             },
             "funding": [
                 {
@@ -2407,7 +2407,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-07-18T11:23:11+00:00"
+            "time": "2026-07-26T23:23:20+00:00"
         },
         {
             "name": "guzzlehttp/promises",

From b0c32950dba5e0402f65cd8fe4da9241141d912a Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Mon, 3 Aug 2026 16:02:03 -0700
Subject: [PATCH 38/52] Update dependencies

---
 composer.json     |  18 +-
 package-lock.json | 578 +++++++++++++++++++++++-----------------------
 package.json      |   6 +-
 3 files changed, 302 insertions(+), 300 deletions(-)

diff --git a/composer.json b/composer.json
index d0a66693b0..0bd34886e4 100644
--- a/composer.json
+++ b/composer.json
@@ -154,21 +154,21 @@
                 "connector-docusign": "1.11.2",
                 "connector-idp": "1.14.2",
                 "connector-pdf-print": "1.23.3",
-                "connector-send-email": "1.32.18",
+                "connector-send-email": "1.32.19",
                 "connector-slack": "1.9.7",
                 "docker-executor-node-ssr": "1.7.4",
                 "package-ab-testing": "1.4.2",
                 "package-actions-by-email": "1.22.17",
-                "package-advanced-user-manager": "1.13.3",
-                "package-ai": "1.16.24",
+                "package-advanced-user-manager": "1.13.4",
+                "package-ai": "1.16.25",
                 "package-analytics-reporting": "1.11.5",
-                "package-auth": "1.24.19",
-                "package-collections": "2.27.9",
+                "package-auth": "1.24.20",
+                "package-collections": "2.27.10",
                 "package-comments": "1.16.4",
                 "package-conversational-forms": "1.15.2",
-                "package-data-sources": "1.34.12",
+                "package-data-sources": "1.34.13",
                 "package-decision-engine": "1.16.3",
-                "package-dynamic-ui": "1.28.5",
+                "package-dynamic-ui": "1.28.6",
                 "package-email-start-event": "1.0.13",
                 "package-files": "1.23.7",
                 "package-googleplaces": "1.12.1",
@@ -179,9 +179,9 @@
                 "package-product-analytics": "1.5.11",
                 "package-projects": "1.12.9",
                 "package-rpa": "1.1.2",
-                "package-savedsearch": "1.43.14",
+                "package-savedsearch": "1.43.15",
                 "package-slideshow": "1.4.3",
-                "package-smart-extract": "1.0.0",
+                "package-smart-extract": "1.0.1",
                 "package-signature": "1.15.6",
                 "package-testing": "1.8.2",
                 "package-translations": "2.14.6",
diff --git a/package-lock.json b/package-lock.json
index b751211351..1946a5d866 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,10 +20,10 @@
                 "@fortawesome/free-solid-svg-icons": "^5.15.1",
                 "@fortawesome/vue-fontawesome": "^0.1.9",
                 "@panter/vue-i18next": "^0.15.2",
-                "@processmaker/modeler": "1.69.42",
+                "@processmaker/modeler": "1.69.43",
                 "@processmaker/processmaker-bpmn-moddle": "0.16.1",
-                "@processmaker/screen-builder": "3.8.36",
-                "@processmaker/vue-form-elements": "0.65.9",
+                "@processmaker/screen-builder": "3.8.37",
+                "@processmaker/vue-form-elements": "0.65.10",
                 "@processmaker/vue-multiselect": "2.3.2",
                 "@tinymce/tinymce-vue": "2.0.0",
                 "axios": "^0.27.2",
@@ -2279,31 +2279,31 @@
             }
         },
         "node_modules/@floating-ui/core": {
-            "version": "1.7.5",
-            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
-            "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==",
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.8.0.tgz",
+            "integrity": "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/utils": "^0.2.11"
+                "@floating-ui/utils": "^0.2.12"
             }
         },
         "node_modules/@floating-ui/dom": {
-            "version": "1.7.6",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
-            "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.8.0.tgz",
+            "integrity": "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/core": "^1.7.5",
-                "@floating-ui/utils": "^0.2.11"
+                "@floating-ui/core": "^1.8.0",
+                "@floating-ui/utils": "^0.2.12"
             }
         },
         "node_modules/@floating-ui/react-dom": {
-            "version": "2.1.8",
-            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.8.tgz",
-            "integrity": "sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==",
+            "version": "2.1.9",
+            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.9.tgz",
+            "integrity": "sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg==",
             "license": "MIT",
             "dependencies": {
-                "@floating-ui/dom": "^1.7.6"
+                "@floating-ui/dom": "^1.8.0"
             },
             "peerDependencies": {
                 "react": ">=16.8.0",
@@ -2311,9 +2311,9 @@
             }
         },
         "node_modules/@floating-ui/utils": {
-            "version": "0.2.11",
-            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
-            "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg==",
+            "version": "0.2.12",
+            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.12.tgz",
+            "integrity": "sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww==",
             "license": "MIT"
         },
         "node_modules/@fontsource/poppins": {
@@ -3748,9 +3748,9 @@
             "license": "MIT"
         },
         "node_modules/@processmaker/modeler": {
-            "version": "1.69.42",
-            "resolved": "https://registry.npmjs.org/@processmaker/modeler/-/modeler-1.69.42.tgz",
-            "integrity": "sha512-t/0PL1ntTBng6FmL9aFYG2ioLZcGKPwK69LlwFcjWATU/PA/LUESRz05hA5InvAOjm2W1zwkxrGezLRxXGkN/Q==",
+            "version": "1.69.43",
+            "resolved": "https://registry.npmjs.org/@processmaker/modeler/-/modeler-1.69.43.tgz",
+            "integrity": "sha512-5b2WvbQw49eoHUADmqAi1/Fxkndc6n8vAqMnr1bHTph6LEgVUzn4C2UyGgqMz+hlldhrBGEKw/XEtePXnmUxTQ==",
             "dependencies": {
                 "@babel/plugin-proposal-private-methods": "^7.12.1",
                 "@fortawesome/fontawesome-free": "^5.11.2",
@@ -3758,8 +3758,8 @@
                 "@fortawesome/free-brands-svg-icons": "^6.4.2",
                 "@fortawesome/free-solid-svg-icons": "^5.11.2",
                 "@fortawesome/vue-fontawesome": "^0.1.8",
-                "@processmaker/screen-builder": "3.8.36",
-                "@processmaker/vue-form-elements": "0.65.9",
+                "@processmaker/screen-builder": "3.8.37",
+                "@processmaker/vue-form-elements": "0.65.10",
                 "@processmaker/vue-multiselect": "2.3.2",
                 "bootstrap": "^4.3.1",
                 "bootstrap-vue": "^2.0.4",
@@ -3932,9 +3932,9 @@
             }
         },
         "node_modules/@processmaker/screen-builder": {
-            "version": "3.8.36",
-            "resolved": "https://registry.npmjs.org/@processmaker/screen-builder/-/screen-builder-3.8.36.tgz",
-            "integrity": "sha512-jubdmvBiG+5oreeY2E90Cnk+AjF7kNJ3V8i2Lz7QCSx8/47cXtoBAnGmctXiKkG+R96TGAA3Vyxh+3AC7iDBAQ==",
+            "version": "3.8.37",
+            "resolved": "https://registry.npmjs.org/@processmaker/screen-builder/-/screen-builder-3.8.37.tgz",
+            "integrity": "sha512-KwAAiXa/7x9tp/eYexH7BAdCbjCyEUPng6Mg+ctEIHz1XTUai8bkSGWmR2JOcDSNjrYCPrTSx172qU5E7EVzxg==",
             "dependencies": {
                 "@chantouchsek/validatorjs": "1.2.3",
                 "@storybook/addon-docs": "^7.6.13",
@@ -3959,7 +3959,7 @@
             },
             "peerDependencies": {
                 "@panter/vue-i18next": "^0.15.0",
-                "@processmaker/vue-form-elements": "0.65.9",
+                "@processmaker/vue-form-elements": "0.65.10",
                 "i18next": "^15.0.8",
                 "vue": "^2.6.12",
                 "vuex": "^3.1.1"
@@ -4008,9 +4008,9 @@
             "license": "MIT"
         },
         "node_modules/@processmaker/vue-form-elements": {
-            "version": "0.65.9",
-            "resolved": "https://registry.npmjs.org/@processmaker/vue-form-elements/-/vue-form-elements-0.65.9.tgz",
-            "integrity": "sha512-h1y6TlmQL+NIJ2iGjDd6nMQ7ex3SYQuLfh2EMM0XhDKpFJ+UCjWCSaxLqPc3WMRKBquXoQkN1k+O9zi2Yc3L1w==",
+            "version": "0.65.10",
+            "resolved": "https://registry.npmjs.org/@processmaker/vue-form-elements/-/vue-form-elements-0.65.10.tgz",
+            "integrity": "sha512-uPemEhLPPx2uN8wxktGSjMzmZtzYLIRHsBFoGv/OozOobtrx4iw0h7zkb1PcB84bHqh3Y0Xx/EagENJ/nltnPQ==",
             "license": "MIT",
             "dependencies": {
                 "@chantouchsek/validatorjs": "1.2.3",
@@ -4412,18 +4412,18 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar": {
-            "version": "1.1.15",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-toolbar/-/react-toolbar-1.1.15.tgz",
-            "integrity": "sha512-t/iEuVjUnXXtrsGK40AA43uIx37sn3AqZ7oAVnPICK6lFJP6dzMzWR3U9b6eCfFjb6wtSEqkJ9Rn9xDjiOx20g==",
+            "version": "1.1.19",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-toolbar/-/react-toolbar-1.1.19.tgz",
+            "integrity": "sha512-Ph0IvtYw4VB12ZnZg+YtrGs8yJQsnizwo/zu0R4Y/nWugtJzA7Pg1eWeuDR9+LSqn+xjamss+UOSOJJJ4gx8jw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.5",
-                "@radix-ui/react-context": "1.2.0",
-                "@radix-ui/react-direction": "1.1.2",
-                "@radix-ui/react-primitive": "2.1.7",
-                "@radix-ui/react-roving-focus": "1.1.15",
-                "@radix-ui/react-separator": "1.1.11",
-                "@radix-ui/react-toggle-group": "1.1.15"
+                "@radix-ui/primitive": "1.1.7",
+                "@radix-ui/react-context": "1.2.2",
+                "@radix-ui/react-direction": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.10",
+                "@radix-ui/react-roving-focus": "1.1.19",
+                "@radix-ui/react-separator": "1.1.15",
+                "@radix-ui/react-toggle-group": "1.1.19"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4441,15 +4441,15 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/primitive": {
-            "version": "1.1.5",
-            "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.5.tgz",
-            "integrity": "sha512-d86WIWFYNtGA0H/d8exstrTRTp7eWJYlYJbtNofxr/3ljupZYn6EFDG/Qgu/0Kc8v7yMUxySagqJsL1+PdYjWg==",
+            "version": "1.1.7",
+            "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.7.tgz",
+            "integrity": "sha512-rqWnm76nYT8HoNNqEjpgJ7Pw/DrBj5iBTrmEPo6HTX5+VJyBNOqTdv4g89G63HuR5g0AaENoAcH7Is5fF2kZ8Q==",
             "license": "MIT"
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-compose-refs": {
-            "version": "1.1.3",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.3.tgz",
-            "integrity": "sha512-rYOP8OMnuuPMQF1uhPVlGNcCDlkokKqGFE3JcxFViIkAXP7EvFWUliJAstrapypaBLJNHbZL6jGhbVDGTwmVhA==",
+            "version": "1.1.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.5.tgz",
+            "integrity": "sha512-+48PbAAbq3didjJxa+OaWY2ZwgAKsNiRGyeHKszblZMQ+kcpd9pAaT11cMkGEie0vsOi3QdeTE6d5Fe3Gn61kA==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -4462,9 +4462,9 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-context": {
-            "version": "1.2.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.2.0.tgz",
-            "integrity": "sha512-fOE+JtN9rygNZkCnHRBEP0TAvLldlhyOxMsbwFvTP4nAs+nBmfnna+o/Zski2wkmY1YMrFC0aSzsHoLY47iLrg==",
+            "version": "1.2.2",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.2.2.tgz",
+            "integrity": "sha512-RHCUGwKHDr0hDGg4X7ma4JG4/+12qxw8rkh5QKdDldlCvtja6nUx1Ef/8HVrJze81lEsgLQlqjzjGNHantgnQA==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -4477,9 +4477,9 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-direction": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.2.tgz",
-            "integrity": "sha512-C3vFhbyi4SW3PmbAi6Awpu4OzJtd0MxGurvSsYtr7p7nM8RNB3VAF3CUmnp2j50knpkrRcB7+ycVXzgLgF6yNA==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.4.tgz",
+            "integrity": "sha512-5pzg4FGQNpExhnhT2zlrP1wZFaYCd1K0nYWoFAdcYoYK868IEigqMX3B3f8yIoRlAhAeDWciLI6ZdCKHF9P4Vg==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -4492,12 +4492,12 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-id": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.2.tgz",
-            "integrity": "sha512-orBC88futVpqCmhX1p4cvquNHsELQ+w+vBJnuj3ftETI5bJb0bZn3Tqu3SWN2IOcPycTnMGnhwoermvISt72sA==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.4.tgz",
+            "integrity": "sha512-TMQp2llA+RYn7JcjnrMnz7wN4pcVttPZnRZo52PLQsoLVKzNlVwUeHmfePgTgRluXFvlD3GD5g5MOVVTJCO0qA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-use-layout-effect": "1.1.2"
+                "@radix-ui/react-use-layout-effect": "1.1.4"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4510,12 +4510,12 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-primitive": {
-            "version": "2.1.7",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.7.tgz",
-            "integrity": "sha512-bC3NiwsprbxKjuon9l7X6BUTw7FPVzEYaL92MPEY5SCd/9hUTPXVFtVwRix7778wtRsVao+zE062gL79FZleeQ==",
+            "version": "2.1.10",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.10.tgz",
+            "integrity": "sha512-MucOnzh6hR5mid6VpkbglRAMYMjKLqRnGBbjXkzjK52fuQDd1qbkx78a5P40mkcnVXJdEVxm26E9OPAiUq7nBg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-slot": "1.3.0"
+                "@radix-ui/react-slot": "1.3.3"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4533,22 +4533,22 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-roving-focus": {
-            "version": "1.1.15",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.15.tgz",
-            "integrity": "sha512-40svmmugfM3mUN7VUDGVE1tQGOhyi8enlGD0CNJEcMM36C1f71PKM21DFgNHUfem0XnA+d8H8oN3Z9ZpJjSslg==",
+            "version": "1.1.19",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.19.tgz",
+            "integrity": "sha512-V9jI6hDjT7l3jsCQD9bLNvDLM3tH/gdbOTp7Tefp3hbbgCGQoK7tUvrWiRlcoBHIZ809ElXwNQwVo0B98LuTXQ==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.5",
-                "@radix-ui/react-collection": "1.1.12",
-                "@radix-ui/react-compose-refs": "1.1.3",
-                "@radix-ui/react-context": "1.2.0",
-                "@radix-ui/react-direction": "1.1.2",
-                "@radix-ui/react-id": "1.1.2",
-                "@radix-ui/react-primitive": "2.1.7",
-                "@radix-ui/react-use-callback-ref": "1.1.2",
-                "@radix-ui/react-use-controllable-state": "1.2.3",
-                "@radix-ui/react-use-is-hydrated": "0.1.1",
-                "@radix-ui/react-use-layout-effect": "1.1.2"
+                "@radix-ui/primitive": "1.1.7",
+                "@radix-ui/react-collection": "1.1.15",
+                "@radix-ui/react-compose-refs": "1.1.5",
+                "@radix-ui/react-context": "1.2.2",
+                "@radix-ui/react-direction": "1.1.4",
+                "@radix-ui/react-id": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.10",
+                "@radix-ui/react-use-callback-ref": "1.1.4",
+                "@radix-ui/react-use-controllable-state": "1.2.6",
+                "@radix-ui/react-use-is-hydrated": "0.1.3",
+                "@radix-ui/react-use-layout-effect": "1.1.4"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4566,15 +4566,15 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-roving-focus/node_modules/@radix-ui/react-collection": {
-            "version": "1.1.12",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.12.tgz",
-            "integrity": "sha512-nb67INpE0IahJKN7EYPp9m9YGwYeKlnzxT3MwXVkgCskaSJia97kG4T0ywpjNUSSnoJk/uvk12V8vbrEHEj+/Q==",
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.15.tgz",
+            "integrity": "sha512-9W+B9NPF0NaaPh/1NJd3+KqsnlLqU9H7T2rvww+fp+T/evVXdNAyYcnfRQZFOjkR1ajQp3yORlqnI8soawLvNA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-compose-refs": "1.1.3",
-                "@radix-ui/react-context": "1.2.0",
-                "@radix-ui/react-primitive": "2.1.7",
-                "@radix-ui/react-slot": "1.3.0"
+                "@radix-ui/react-compose-refs": "1.1.5",
+                "@radix-ui/react-context": "1.2.2",
+                "@radix-ui/react-primitive": "2.1.10",
+                "@radix-ui/react-slot": "1.3.3"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4592,12 +4592,12 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-separator": {
-            "version": "1.1.11",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.11.tgz",
-            "integrity": "sha512-jRhe86+8PF7VZ1u14eOWVOuh2BuAhALg/FT1VcMC4OHedMTRUazDnDlKTt+yxo5cRNKHMfmvZ4sSQtWDeMV4CQ==",
+            "version": "1.1.15",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.15.tgz",
+            "integrity": "sha512-jOLO4lssEzWpoDu7G+Ze4VjwMRUBt291pnZD0gmalREZipnTX3wadQo7Fy48GCTfe14/YRN6rw/rOJqrE85Wxw==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-primitive": "2.1.7"
+                "@radix-ui/react-primitive": "2.1.10"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4615,12 +4615,12 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-slot": {
-            "version": "1.3.0",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.3.0.tgz",
-            "integrity": "sha512-MojKku4U/miO8Av4Dkb+ctMAQx7JmY96LmtDQlAarCRtd7rN52QCSzBF+XAvr5S6coSVj9HEPBgHAHKEJVk/WA==",
+            "version": "1.3.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.3.3.tgz",
+            "integrity": "sha512-qx7oqnYbxnK9kYI9m317qmFmEgo6ywqWvbTogdj7cL9p3/yx4M48p7Rnw5z3H890cL/ow/EeWJsuTykeZVXP5Q==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-compose-refs": "1.1.3"
+                "@radix-ui/react-compose-refs": "1.1.5"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4633,18 +4633,18 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-toggle-group": {
-            "version": "1.1.15",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle-group/-/react-toggle-group-1.1.15.tgz",
-            "integrity": "sha512-gIC5Q+Xljg7lmUdzSuDoy0t97yZn1sZl00Ra37ZvKrYdWnQLU6sWLd09yG8cIB9jUAlQfHgJ2ACAG00MFwsqSQ==",
+            "version": "1.1.19",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle-group/-/react-toggle-group-1.1.19.tgz",
+            "integrity": "sha512-OtnwuSVjd1Ofi+AdnvhsjQdyuhCDwYs1w9RyB5BN/OavXOVQo42SYqQjwUnbPnaiPFBpQ9aX70dWeee+v2oBLA==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.5",
-                "@radix-ui/react-context": "1.2.0",
-                "@radix-ui/react-direction": "1.1.2",
-                "@radix-ui/react-primitive": "2.1.7",
-                "@radix-ui/react-roving-focus": "1.1.15",
-                "@radix-ui/react-toggle": "1.1.14",
-                "@radix-ui/react-use-controllable-state": "1.2.3"
+                "@radix-ui/primitive": "1.1.7",
+                "@radix-ui/react-context": "1.2.2",
+                "@radix-ui/react-direction": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.10",
+                "@radix-ui/react-roving-focus": "1.1.19",
+                "@radix-ui/react-toggle": "1.1.18",
+                "@radix-ui/react-use-controllable-state": "1.2.6"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4662,14 +4662,14 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-toggle-group/node_modules/@radix-ui/react-toggle": {
-            "version": "1.1.14",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.14.tgz",
-            "integrity": "sha512-QI/hB65XKWACA66P64A+aHxtLUgHJeJLkaQa+awUNXT6T3swndtY5DojeHA+vldrTspMTtFBd7HfZ9QGbM1Qrw==",
+            "version": "1.1.18",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.18.tgz",
+            "integrity": "sha512-7lonPlKfSacd20GlOBx2ltuVKz9oqWYZz+oMQyOltw6t1y2nyftj2ZmwwUHYn49kqfDWcp8dNZm5NgV+5Z+mug==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/primitive": "1.1.5",
-                "@radix-ui/react-primitive": "2.1.7",
-                "@radix-ui/react-use-controllable-state": "1.2.3"
+                "@radix-ui/primitive": "1.1.7",
+                "@radix-ui/react-primitive": "2.1.10",
+                "@radix-ui/react-use-controllable-state": "1.2.6"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4687,9 +4687,9 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-use-callback-ref": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.2.tgz",
-            "integrity": "sha512-xCso9j1/u8sEgP1RNHjFrXJLApL8LiqOkI1R4ywuN00rxWdYg4oQXuwKLS3i0j5NWLromUD27/4nlxj2UFVvIw==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.4.tgz",
+            "integrity": "sha512-R6OUY2e2fA6Yn6s+VSx5KBV6Nx8LQEhu+cz7LCej18rQ1HLyg9PSC9jP/ZNx0o6FAIK9c0F1kHylzSxKsdlkrQ==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -4702,13 +4702,14 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-use-controllable-state": {
-            "version": "1.2.3",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.3.tgz",
-            "integrity": "sha512-PLzC90MS+ReootmjC597dvopoelpZ8Q61HJkDXZSExitIq7PL55vHNnesAHwguHK0aPfBnpdNzQtv1uliaqQrA==",
+            "version": "1.2.6",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.6.tgz",
+            "integrity": "sha512-uEQJGT97ZA/TgP/Hydw47lHu+/vQj6z/0jA+WeTbK1o9Rx45GImjpD0tc3W5ad3D6XTSR6e1yEO0FvGq6WQfVQ==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-use-effect-event": "0.0.3",
-                "@radix-ui/react-use-layout-effect": "1.1.2"
+                "@radix-ui/primitive": "1.1.7",
+                "@radix-ui/react-use-effect-event": "0.0.5",
+                "@radix-ui/react-use-layout-effect": "1.1.4"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4721,9 +4722,9 @@
             }
         },
         "node_modules/@radix-ui/react-toolbar/node_modules/@radix-ui/react-use-layout-effect": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.2.tgz",
-            "integrity": "sha512-jrBWOxZITuGcnjRCM2t2U5ZPkCLxD+Ym6DjfssS5haTj2iiak/DOb64JeN6OdLfLgptb6/e2kKR+ZuTrGoZTPA==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.4.tgz",
+            "integrity": "sha512-K20DkRkUwDnxEYMBPcg3Y6voLkEy5p5QQmszZgLngKKiC7dzBR/aEuK3w1qlx2JWDUNH6FluahYdgR3BP+QbYw==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -4773,12 +4774,12 @@
             }
         },
         "node_modules/@radix-ui/react-use-effect-event": {
-            "version": "0.0.3",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.3.tgz",
-            "integrity": "sha512-6c8ZqvPTWILEKnyVkP53EGRCcpnJiKTC21sS/6R1GF5xKyHJJWQEPfkqlcgUkdRQivd6tb23abUwe4ngWmY0JA==",
+            "version": "0.0.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.5.tgz",
+            "integrity": "sha512-7cshFL8HGS/7HEiHH+9kL9HBwp2sa9yX18Knwek6KYWmXwM7pegMgta2AXMQKI+rq3JnfSj9x8wYqFMTdG1Jgg==",
             "license": "MIT",
             "dependencies": {
-                "@radix-ui/react-use-layout-effect": "1.1.2"
+                "@radix-ui/react-use-layout-effect": "1.1.4"
             },
             "peerDependencies": {
                 "@types/react": "*",
@@ -4791,9 +4792,9 @@
             }
         },
         "node_modules/@radix-ui/react-use-effect-event/node_modules/@radix-ui/react-use-layout-effect": {
-            "version": "1.1.2",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.2.tgz",
-            "integrity": "sha512-jrBWOxZITuGcnjRCM2t2U5ZPkCLxD+Ym6DjfssS5haTj2iiak/DOb64JeN6OdLfLgptb6/e2kKR+ZuTrGoZTPA==",
+            "version": "1.1.4",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.4.tgz",
+            "integrity": "sha512-K20DkRkUwDnxEYMBPcg3Y6voLkEy5p5QQmszZgLngKKiC7dzBR/aEuK3w1qlx2JWDUNH6FluahYdgR3BP+QbYw==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -4825,9 +4826,9 @@
             }
         },
         "node_modules/@radix-ui/react-use-is-hydrated": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.1.tgz",
-            "integrity": "sha512-qwOiz4Tjo8CNnrOLAYUMXeZwDzXgXpvK4TKQPmWLECM9XoWvA6+0Z2/7Ag3A4ivjS4ovbLJPbskkxioFyBhr8A==",
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.3.tgz",
+            "integrity": "sha512-umO/aJ+82CpOnhDZUTbILCQf7kU/g0iv+oGs/Q8jw7IkhWBzaEP4sA268PhFAJTFetbwp3ICc6ktpI4TqtxcIw==",
             "license": "MIT",
             "peerDependencies": {
                 "@types/react": "*",
@@ -5149,9 +5150,9 @@
             }
         },
         "node_modules/@sinclair/typebox": {
-            "version": "0.27.10",
-            "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.10.tgz",
-            "integrity": "sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA==",
+            "version": "0.27.12",
+            "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.12.tgz",
+            "integrity": "sha512-hhyNJ+nbR6ZR7pToHvllEFun9TL0sbL+tk/ON75lo+Xas054uez98qRbsuNt7MBCyZKK4+8Yli/OAGZhmfBZ/g==",
             "license": "MIT"
         },
         "node_modules/@sindresorhus/is": {
@@ -5364,9 +5365,9 @@
             }
         },
         "node_modules/@storybook/core-common/node_modules/brace-expansion": {
-            "version": "2.1.2",
-            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz",
-            "integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==",
+            "version": "2.1.4",
+            "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz",
+            "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==",
             "license": "MIT",
             "dependencies": {
                 "balanced-match": "^1.0.0"
@@ -6097,9 +6098,9 @@
             }
         },
         "node_modules/@types/lodash": {
-            "version": "4.17.24",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.24.tgz",
-            "integrity": "sha512-gIW7lQLZbue7lRSWEFql49QJJWThrTFFeIMJdp3eH4tKoxm1OvEPg02rm4wCCSHS0cL3/Fizimb35b7k8atwsQ==",
+            "version": "4.17.25",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.25.tgz",
+            "integrity": "sha512-+K1NIO8I+F9/wNulfVvu23QYd0Pe9/OCqRrim4NoYIf1VoEDL90Ve4ClzpyqBLc7NpGGWRvYNCKZ1BE/Jpf8dQ==",
             "license": "MIT"
         },
         "node_modules/@types/mdx": {
@@ -18493,9 +18494,9 @@
             }
         },
         "node_modules/react-colorful": {
-            "version": "5.7.0",
-            "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.7.0.tgz",
-            "integrity": "sha512-fuesYIemttah97XmsIHmz4OORDHiSFzyc9HMAIrCHJou2jaRQmL8cFJ76K4zQhhj8jzwOBlOi4BaGTjjOZCfTg==",
+            "version": "5.8.0",
+            "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.8.0.tgz",
+            "integrity": "sha512-Wy9OzPfjSN9bF12OB8N7UQvlsZ0I+7wHxpN+bV5BjNQGxOj6IiwkRjevJK9yOBjJWGQvAaf1OXtn8rUeEatAng==",
             "license": "MIT",
             "peerDependencies": {
                 "react": ">=16.8.0",
@@ -18767,9 +18768,9 @@
             }
         },
         "node_modules/recast": {
-            "version": "0.23.12",
-            "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.12.tgz",
-            "integrity": "sha512-dEWRjcINDu/F4l2dYx57ugBtD7HV9KXESyxhzw/MqWLeglJrsjJKqACPyUPg+6AF8mIgm+Zi0dZ3ACoIg+QtpA==",
+            "version": "0.23.19",
+            "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.19.tgz",
+            "integrity": "sha512-T98lym7kH+pnZmRaD8yDRdaNqyUbwnbEBx0MuchrzMFOEMray4AO3ZJoTUZ5r78Ao78X/OhzW0DL8GB85w/I2w==",
             "license": "MIT",
             "dependencies": {
                 "ast-types": "^0.16.1",
@@ -20908,9 +20909,9 @@
             }
         },
         "node_modules/synchronous-promise": {
-            "version": "2.0.17",
-            "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.17.tgz",
-            "integrity": "sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g==",
+            "version": "2.0.18",
+            "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.18.tgz",
+            "integrity": "sha512-4EEtGWYLkSoy/DjlKpHR6LT2AjmORt8HM+CUCSdKiKyuhL3PFBksgcTibSOj7JIoCvuqRVnZ7P9QFBMXR5kW6Q==",
             "license": "BSD-3-Clause"
         },
         "node_modules/tailwindcss": {
@@ -25020,34 +25021,34 @@
             "dev": true
         },
         "@floating-ui/core": {
-            "version": "1.7.5",
-            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.7.5.tgz",
-            "integrity": "sha512-1Ih4WTWyw0+lKyFMcBHGbb5U5FtuHJuujoyyr5zTaWS5EYMeT6Jb2AuDeftsCsEuchO+mM2ij5+q9crhydzLhQ==",
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/@floating-ui/core/-/core-1.8.0.tgz",
+            "integrity": "sha512-0CIZ5itps/8x7BG8dEIhs53BvCUH2PCoogtakwRTut+Arm58sJooJ0AuZhLw2HJYIR5cMLNPBSS728sPho2khQ==",
             "requires": {
-                "@floating-ui/utils": "^0.2.11"
+                "@floating-ui/utils": "^0.2.12"
             }
         },
         "@floating-ui/dom": {
-            "version": "1.7.6",
-            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.7.6.tgz",
-            "integrity": "sha512-9gZSAI5XM36880PPMm//9dfiEngYoC6Am2izES1FF406YFsjvyBMmeJ2g4SAju3xWwtuynNRFL2s9hgxpLI5SQ==",
+            "version": "1.8.0",
+            "resolved": "https://registry.npmjs.org/@floating-ui/dom/-/dom-1.8.0.tgz",
+            "integrity": "sha512-yXSrzeHZBTZadLOlfyhCkJHNeLJnHRnRInwdZ40L7ZiaAtrBwoYlsDrX3v5zB1Utk7CLfzcOVnVVWoXEky7Ceg==",
             "requires": {
-                "@floating-ui/core": "^1.7.5",
-                "@floating-ui/utils": "^0.2.11"
+                "@floating-ui/core": "^1.8.0",
+                "@floating-ui/utils": "^0.2.12"
             }
         },
         "@floating-ui/react-dom": {
-            "version": "2.1.8",
-            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.8.tgz",
-            "integrity": "sha512-cC52bHwM/n/CxS87FH0yWdngEZrjdtLW/qVruo68qg+prK7ZQ4YGdut2GyDVpoGeAYe/h899rVeOVm6Oi40k2A==",
+            "version": "2.1.9",
+            "resolved": "https://registry.npmjs.org/@floating-ui/react-dom/-/react-dom-2.1.9.tgz",
+            "integrity": "sha512-JDjEFGCpImxDCA7JJKviA0M9+RtmJdj0m/NVU5IMgBK+AmZouAQQ7/+2GLH0GXXY0YMw9oXPB8hKdbPYg5QLYg==",
             "requires": {
-                "@floating-ui/dom": "^1.7.6"
+                "@floating-ui/dom": "^1.8.0"
             }
         },
         "@floating-ui/utils": {
-            "version": "0.2.11",
-            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.11.tgz",
-            "integrity": "sha512-RiB/yIh78pcIxl6lLMG0CgBXAZ2Y0eVHqMPYugu+9U0AeT6YBeiJpf7lbdJNIugFP5SIjwNRgo4DhR1Qxi26Gg=="
+            "version": "0.2.12",
+            "resolved": "https://registry.npmjs.org/@floating-ui/utils/-/utils-0.2.12.tgz",
+            "integrity": "sha512-HpCo8tmWzLVad5s2d19EhAz5zqrrQ6s69qd6moPMQvkOuSwDT1YgRfWSVuc4ennqrgv3OHppiOGMQ7oC13yIww=="
         },
         "@fontsource/poppins": {
             "version": "5.0.8",
@@ -26007,9 +26008,9 @@
             "dev": true
         },
         "@processmaker/modeler": {
-            "version": "1.69.42",
-            "resolved": "https://registry.npmjs.org/@processmaker/modeler/-/modeler-1.69.42.tgz",
-            "integrity": "sha512-t/0PL1ntTBng6FmL9aFYG2ioLZcGKPwK69LlwFcjWATU/PA/LUESRz05hA5InvAOjm2W1zwkxrGezLRxXGkN/Q==",
+            "version": "1.69.43",
+            "resolved": "https://registry.npmjs.org/@processmaker/modeler/-/modeler-1.69.43.tgz",
+            "integrity": "sha512-5b2WvbQw49eoHUADmqAi1/Fxkndc6n8vAqMnr1bHTph6LEgVUzn4C2UyGgqMz+hlldhrBGEKw/XEtePXnmUxTQ==",
             "requires": {
                 "@babel/plugin-proposal-private-methods": "^7.12.1",
                 "@fortawesome/fontawesome-free": "^5.11.2",
@@ -26017,8 +26018,8 @@
                 "@fortawesome/free-brands-svg-icons": "^6.4.2",
                 "@fortawesome/free-solid-svg-icons": "^5.11.2",
                 "@fortawesome/vue-fontawesome": "^0.1.8",
-                "@processmaker/screen-builder": "3.8.36",
-                "@processmaker/vue-form-elements": "0.65.9",
+                "@processmaker/screen-builder": "3.8.37",
+                "@processmaker/vue-form-elements": "0.65.10",
                 "@processmaker/vue-multiselect": "2.3.2",
                 "bootstrap": "^4.3.1",
                 "bootstrap-vue": "^2.0.4",
@@ -26133,9 +26134,9 @@
             }
         },
         "@processmaker/screen-builder": {
-            "version": "3.8.36",
-            "resolved": "https://registry.npmjs.org/@processmaker/screen-builder/-/screen-builder-3.8.36.tgz",
-            "integrity": "sha512-jubdmvBiG+5oreeY2E90Cnk+AjF7kNJ3V8i2Lz7QCSx8/47cXtoBAnGmctXiKkG+R96TGAA3Vyxh+3AC7iDBAQ==",
+            "version": "3.8.37",
+            "resolved": "https://registry.npmjs.org/@processmaker/screen-builder/-/screen-builder-3.8.37.tgz",
+            "integrity": "sha512-KwAAiXa/7x9tp/eYexH7BAdCbjCyEUPng6Mg+ctEIHz1XTUai8bkSGWmR2JOcDSNjrYCPrTSx172qU5E7EVzxg==",
             "requires": {
                 "@chantouchsek/validatorjs": "1.2.3",
                 "@storybook/addon-docs": "^7.6.13",
@@ -26189,9 +26190,9 @@
             }
         },
         "@processmaker/vue-form-elements": {
-            "version": "0.65.9",
-            "resolved": "https://registry.npmjs.org/@processmaker/vue-form-elements/-/vue-form-elements-0.65.9.tgz",
-            "integrity": "sha512-h1y6TlmQL+NIJ2iGjDd6nMQ7ex3SYQuLfh2EMM0XhDKpFJ+UCjWCSaxLqPc3WMRKBquXoQkN1k+O9zi2Yc3L1w==",
+            "version": "0.65.10",
+            "resolved": "https://registry.npmjs.org/@processmaker/vue-form-elements/-/vue-form-elements-0.65.10.tgz",
+            "integrity": "sha512-uPemEhLPPx2uN8wxktGSjMzmZtzYLIRHsBFoGv/OozOobtrx4iw0h7zkb1PcB84bHqh3Y0Xx/EagENJ/nltnPQ==",
             "requires": {
                 "@chantouchsek/validatorjs": "1.2.3",
                 "@tinymce/tinymce-vue": "2.0.0",
@@ -26401,150 +26402,151 @@
             }
         },
         "@radix-ui/react-toolbar": {
-            "version": "1.1.15",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-toolbar/-/react-toolbar-1.1.15.tgz",
-            "integrity": "sha512-t/iEuVjUnXXtrsGK40AA43uIx37sn3AqZ7oAVnPICK6lFJP6dzMzWR3U9b6eCfFjb6wtSEqkJ9Rn9xDjiOx20g==",
+            "version": "1.1.19",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-toolbar/-/react-toolbar-1.1.19.tgz",
+            "integrity": "sha512-Ph0IvtYw4VB12ZnZg+YtrGs8yJQsnizwo/zu0R4Y/nWugtJzA7Pg1eWeuDR9+LSqn+xjamss+UOSOJJJ4gx8jw==",
             "requires": {
-                "@radix-ui/primitive": "1.1.5",
-                "@radix-ui/react-context": "1.2.0",
-                "@radix-ui/react-direction": "1.1.2",
-                "@radix-ui/react-primitive": "2.1.7",
-                "@radix-ui/react-roving-focus": "1.1.15",
-                "@radix-ui/react-separator": "1.1.11",
-                "@radix-ui/react-toggle-group": "1.1.15"
+                "@radix-ui/primitive": "1.1.7",
+                "@radix-ui/react-context": "1.2.2",
+                "@radix-ui/react-direction": "1.1.4",
+                "@radix-ui/react-primitive": "2.1.10",
+                "@radix-ui/react-roving-focus": "1.1.19",
+                "@radix-ui/react-separator": "1.1.15",
+                "@radix-ui/react-toggle-group": "1.1.19"
             },
             "dependencies": {
                 "@radix-ui/primitive": {
-                    "version": "1.1.5",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.5.tgz",
-                    "integrity": "sha512-d86WIWFYNtGA0H/d8exstrTRTp7eWJYlYJbtNofxr/3ljupZYn6EFDG/Qgu/0Kc8v7yMUxySagqJsL1+PdYjWg=="
+                    "version": "1.1.7",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/primitive/-/primitive-1.1.7.tgz",
+                    "integrity": "sha512-rqWnm76nYT8HoNNqEjpgJ7Pw/DrBj5iBTrmEPo6HTX5+VJyBNOqTdv4g89G63HuR5g0AaENoAcH7Is5fF2kZ8Q=="
                 },
                 "@radix-ui/react-compose-refs": {
-                    "version": "1.1.3",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.3.tgz",
-                    "integrity": "sha512-rYOP8OMnuuPMQF1uhPVlGNcCDlkokKqGFE3JcxFViIkAXP7EvFWUliJAstrapypaBLJNHbZL6jGhbVDGTwmVhA==",
+                    "version": "1.1.5",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.1.5.tgz",
+                    "integrity": "sha512-+48PbAAbq3didjJxa+OaWY2ZwgAKsNiRGyeHKszblZMQ+kcpd9pAaT11cMkGEie0vsOi3QdeTE6d5Fe3Gn61kA==",
                     "requires": {}
                 },
                 "@radix-ui/react-context": {
-                    "version": "1.2.0",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.2.0.tgz",
-                    "integrity": "sha512-fOE+JtN9rygNZkCnHRBEP0TAvLldlhyOxMsbwFvTP4nAs+nBmfnna+o/Zski2wkmY1YMrFC0aSzsHoLY47iLrg==",
+                    "version": "1.2.2",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-context/-/react-context-1.2.2.tgz",
+                    "integrity": "sha512-RHCUGwKHDr0hDGg4X7ma4JG4/+12qxw8rkh5QKdDldlCvtja6nUx1Ef/8HVrJze81lEsgLQlqjzjGNHantgnQA==",
                     "requires": {}
                 },
                 "@radix-ui/react-direction": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.2.tgz",
-                    "integrity": "sha512-C3vFhbyi4SW3PmbAi6Awpu4OzJtd0MxGurvSsYtr7p7nM8RNB3VAF3CUmnp2j50knpkrRcB7+ycVXzgLgF6yNA==",
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-direction/-/react-direction-1.1.4.tgz",
+                    "integrity": "sha512-5pzg4FGQNpExhnhT2zlrP1wZFaYCd1K0nYWoFAdcYoYK868IEigqMX3B3f8yIoRlAhAeDWciLI6ZdCKHF9P4Vg==",
                     "requires": {}
                 },
                 "@radix-ui/react-id": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.2.tgz",
-                    "integrity": "sha512-orBC88futVpqCmhX1p4cvquNHsELQ+w+vBJnuj3ftETI5bJb0bZn3Tqu3SWN2IOcPycTnMGnhwoermvISt72sA==",
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-id/-/react-id-1.1.4.tgz",
+                    "integrity": "sha512-TMQp2llA+RYn7JcjnrMnz7wN4pcVttPZnRZo52PLQsoLVKzNlVwUeHmfePgTgRluXFvlD3GD5g5MOVVTJCO0qA==",
                     "requires": {
-                        "@radix-ui/react-use-layout-effect": "1.1.2"
+                        "@radix-ui/react-use-layout-effect": "1.1.4"
                     }
                 },
                 "@radix-ui/react-primitive": {
-                    "version": "2.1.7",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.7.tgz",
-                    "integrity": "sha512-bC3NiwsprbxKjuon9l7X6BUTw7FPVzEYaL92MPEY5SCd/9hUTPXVFtVwRix7778wtRsVao+zE062gL79FZleeQ==",
+                    "version": "2.1.10",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-primitive/-/react-primitive-2.1.10.tgz",
+                    "integrity": "sha512-MucOnzh6hR5mid6VpkbglRAMYMjKLqRnGBbjXkzjK52fuQDd1qbkx78a5P40mkcnVXJdEVxm26E9OPAiUq7nBg==",
                     "requires": {
-                        "@radix-ui/react-slot": "1.3.0"
+                        "@radix-ui/react-slot": "1.3.3"
                     }
                 },
                 "@radix-ui/react-roving-focus": {
-                    "version": "1.1.15",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.15.tgz",
-                    "integrity": "sha512-40svmmugfM3mUN7VUDGVE1tQGOhyi8enlGD0CNJEcMM36C1f71PKM21DFgNHUfem0XnA+d8H8oN3Z9ZpJjSslg==",
-                    "requires": {
-                        "@radix-ui/primitive": "1.1.5",
-                        "@radix-ui/react-collection": "1.1.12",
-                        "@radix-ui/react-compose-refs": "1.1.3",
-                        "@radix-ui/react-context": "1.2.0",
-                        "@radix-ui/react-direction": "1.1.2",
-                        "@radix-ui/react-id": "1.1.2",
-                        "@radix-ui/react-primitive": "2.1.7",
-                        "@radix-ui/react-use-callback-ref": "1.1.2",
-                        "@radix-ui/react-use-controllable-state": "1.2.3",
-                        "@radix-ui/react-use-is-hydrated": "0.1.1",
-                        "@radix-ui/react-use-layout-effect": "1.1.2"
+                    "version": "1.1.19",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-roving-focus/-/react-roving-focus-1.1.19.tgz",
+                    "integrity": "sha512-V9jI6hDjT7l3jsCQD9bLNvDLM3tH/gdbOTp7Tefp3hbbgCGQoK7tUvrWiRlcoBHIZ809ElXwNQwVo0B98LuTXQ==",
+                    "requires": {
+                        "@radix-ui/primitive": "1.1.7",
+                        "@radix-ui/react-collection": "1.1.15",
+                        "@radix-ui/react-compose-refs": "1.1.5",
+                        "@radix-ui/react-context": "1.2.2",
+                        "@radix-ui/react-direction": "1.1.4",
+                        "@radix-ui/react-id": "1.1.4",
+                        "@radix-ui/react-primitive": "2.1.10",
+                        "@radix-ui/react-use-callback-ref": "1.1.4",
+                        "@radix-ui/react-use-controllable-state": "1.2.6",
+                        "@radix-ui/react-use-is-hydrated": "0.1.3",
+                        "@radix-ui/react-use-layout-effect": "1.1.4"
                     },
                     "dependencies": {
                         "@radix-ui/react-collection": {
-                            "version": "1.1.12",
-                            "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.12.tgz",
-                            "integrity": "sha512-nb67INpE0IahJKN7EYPp9m9YGwYeKlnzxT3MwXVkgCskaSJia97kG4T0ywpjNUSSnoJk/uvk12V8vbrEHEj+/Q==",
+                            "version": "1.1.15",
+                            "resolved": "https://registry.npmjs.org/@radix-ui/react-collection/-/react-collection-1.1.15.tgz",
+                            "integrity": "sha512-9W+B9NPF0NaaPh/1NJd3+KqsnlLqU9H7T2rvww+fp+T/evVXdNAyYcnfRQZFOjkR1ajQp3yORlqnI8soawLvNA==",
                             "requires": {
-                                "@radix-ui/react-compose-refs": "1.1.3",
-                                "@radix-ui/react-context": "1.2.0",
-                                "@radix-ui/react-primitive": "2.1.7",
-                                "@radix-ui/react-slot": "1.3.0"
+                                "@radix-ui/react-compose-refs": "1.1.5",
+                                "@radix-ui/react-context": "1.2.2",
+                                "@radix-ui/react-primitive": "2.1.10",
+                                "@radix-ui/react-slot": "1.3.3"
                             }
                         }
                     }
                 },
                 "@radix-ui/react-separator": {
-                    "version": "1.1.11",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.11.tgz",
-                    "integrity": "sha512-jRhe86+8PF7VZ1u14eOWVOuh2BuAhALg/FT1VcMC4OHedMTRUazDnDlKTt+yxo5cRNKHMfmvZ4sSQtWDeMV4CQ==",
+                    "version": "1.1.15",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-separator/-/react-separator-1.1.15.tgz",
+                    "integrity": "sha512-jOLO4lssEzWpoDu7G+Ze4VjwMRUBt291pnZD0gmalREZipnTX3wadQo7Fy48GCTfe14/YRN6rw/rOJqrE85Wxw==",
                     "requires": {
-                        "@radix-ui/react-primitive": "2.1.7"
+                        "@radix-ui/react-primitive": "2.1.10"
                     }
                 },
                 "@radix-ui/react-slot": {
-                    "version": "1.3.0",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.3.0.tgz",
-                    "integrity": "sha512-MojKku4U/miO8Av4Dkb+ctMAQx7JmY96LmtDQlAarCRtd7rN52QCSzBF+XAvr5S6coSVj9HEPBgHAHKEJVk/WA==",
+                    "version": "1.3.3",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-slot/-/react-slot-1.3.3.tgz",
+                    "integrity": "sha512-qx7oqnYbxnK9kYI9m317qmFmEgo6ywqWvbTogdj7cL9p3/yx4M48p7Rnw5z3H890cL/ow/EeWJsuTykeZVXP5Q==",
                     "requires": {
-                        "@radix-ui/react-compose-refs": "1.1.3"
+                        "@radix-ui/react-compose-refs": "1.1.5"
                     }
                 },
                 "@radix-ui/react-toggle-group": {
-                    "version": "1.1.15",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle-group/-/react-toggle-group-1.1.15.tgz",
-                    "integrity": "sha512-gIC5Q+Xljg7lmUdzSuDoy0t97yZn1sZl00Ra37ZvKrYdWnQLU6sWLd09yG8cIB9jUAlQfHgJ2ACAG00MFwsqSQ==",
-                    "requires": {
-                        "@radix-ui/primitive": "1.1.5",
-                        "@radix-ui/react-context": "1.2.0",
-                        "@radix-ui/react-direction": "1.1.2",
-                        "@radix-ui/react-primitive": "2.1.7",
-                        "@radix-ui/react-roving-focus": "1.1.15",
-                        "@radix-ui/react-toggle": "1.1.14",
-                        "@radix-ui/react-use-controllable-state": "1.2.3"
+                    "version": "1.1.19",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle-group/-/react-toggle-group-1.1.19.tgz",
+                    "integrity": "sha512-OtnwuSVjd1Ofi+AdnvhsjQdyuhCDwYs1w9RyB5BN/OavXOVQo42SYqQjwUnbPnaiPFBpQ9aX70dWeee+v2oBLA==",
+                    "requires": {
+                        "@radix-ui/primitive": "1.1.7",
+                        "@radix-ui/react-context": "1.2.2",
+                        "@radix-ui/react-direction": "1.1.4",
+                        "@radix-ui/react-primitive": "2.1.10",
+                        "@radix-ui/react-roving-focus": "1.1.19",
+                        "@radix-ui/react-toggle": "1.1.18",
+                        "@radix-ui/react-use-controllable-state": "1.2.6"
                     },
                     "dependencies": {
                         "@radix-ui/react-toggle": {
-                            "version": "1.1.14",
-                            "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.14.tgz",
-                            "integrity": "sha512-QI/hB65XKWACA66P64A+aHxtLUgHJeJLkaQa+awUNXT6T3swndtY5DojeHA+vldrTspMTtFBd7HfZ9QGbM1Qrw==",
+                            "version": "1.1.18",
+                            "resolved": "https://registry.npmjs.org/@radix-ui/react-toggle/-/react-toggle-1.1.18.tgz",
+                            "integrity": "sha512-7lonPlKfSacd20GlOBx2ltuVKz9oqWYZz+oMQyOltw6t1y2nyftj2ZmwwUHYn49kqfDWcp8dNZm5NgV+5Z+mug==",
                             "requires": {
-                                "@radix-ui/primitive": "1.1.5",
-                                "@radix-ui/react-primitive": "2.1.7",
-                                "@radix-ui/react-use-controllable-state": "1.2.3"
+                                "@radix-ui/primitive": "1.1.7",
+                                "@radix-ui/react-primitive": "2.1.10",
+                                "@radix-ui/react-use-controllable-state": "1.2.6"
                             }
                         }
                     }
                 },
                 "@radix-ui/react-use-callback-ref": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.2.tgz",
-                    "integrity": "sha512-xCso9j1/u8sEgP1RNHjFrXJLApL8LiqOkI1R4ywuN00rxWdYg4oQXuwKLS3i0j5NWLromUD27/4nlxj2UFVvIw==",
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-use-callback-ref/-/react-use-callback-ref-1.1.4.tgz",
+                    "integrity": "sha512-R6OUY2e2fA6Yn6s+VSx5KBV6Nx8LQEhu+cz7LCej18rQ1HLyg9PSC9jP/ZNx0o6FAIK9c0F1kHylzSxKsdlkrQ==",
                     "requires": {}
                 },
                 "@radix-ui/react-use-controllable-state": {
-                    "version": "1.2.3",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.3.tgz",
-                    "integrity": "sha512-PLzC90MS+ReootmjC597dvopoelpZ8Q61HJkDXZSExitIq7PL55vHNnesAHwguHK0aPfBnpdNzQtv1uliaqQrA==",
+                    "version": "1.2.6",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-use-controllable-state/-/react-use-controllable-state-1.2.6.tgz",
+                    "integrity": "sha512-uEQJGT97ZA/TgP/Hydw47lHu+/vQj6z/0jA+WeTbK1o9Rx45GImjpD0tc3W5ad3D6XTSR6e1yEO0FvGq6WQfVQ==",
                     "requires": {
-                        "@radix-ui/react-use-effect-event": "0.0.3",
-                        "@radix-ui/react-use-layout-effect": "1.1.2"
+                        "@radix-ui/primitive": "1.1.7",
+                        "@radix-ui/react-use-effect-event": "0.0.5",
+                        "@radix-ui/react-use-layout-effect": "1.1.4"
                     }
                 },
                 "@radix-ui/react-use-layout-effect": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.2.tgz",
-                    "integrity": "sha512-jrBWOxZITuGcnjRCM2t2U5ZPkCLxD+Ym6DjfssS5haTj2iiak/DOb64JeN6OdLfLgptb6/e2kKR+ZuTrGoZTPA==",
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.4.tgz",
+                    "integrity": "sha512-K20DkRkUwDnxEYMBPcg3Y6voLkEy5p5QQmszZgLngKKiC7dzBR/aEuK3w1qlx2JWDUNH6FluahYdgR3BP+QbYw==",
                     "requires": {}
                 }
             }
@@ -26567,17 +26569,17 @@
             }
         },
         "@radix-ui/react-use-effect-event": {
-            "version": "0.0.3",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.3.tgz",
-            "integrity": "sha512-6c8ZqvPTWILEKnyVkP53EGRCcpnJiKTC21sS/6R1GF5xKyHJJWQEPfkqlcgUkdRQivd6tb23abUwe4ngWmY0JA==",
+            "version": "0.0.5",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-effect-event/-/react-use-effect-event-0.0.5.tgz",
+            "integrity": "sha512-7cshFL8HGS/7HEiHH+9kL9HBwp2sa9yX18Knwek6KYWmXwM7pegMgta2AXMQKI+rq3JnfSj9x8wYqFMTdG1Jgg==",
             "requires": {
-                "@radix-ui/react-use-layout-effect": "1.1.2"
+                "@radix-ui/react-use-layout-effect": "1.1.4"
             },
             "dependencies": {
                 "@radix-ui/react-use-layout-effect": {
-                    "version": "1.1.2",
-                    "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.2.tgz",
-                    "integrity": "sha512-jrBWOxZITuGcnjRCM2t2U5ZPkCLxD+Ym6DjfssS5haTj2iiak/DOb64JeN6OdLfLgptb6/e2kKR+ZuTrGoZTPA==",
+                    "version": "1.1.4",
+                    "resolved": "https://registry.npmjs.org/@radix-ui/react-use-layout-effect/-/react-use-layout-effect-1.1.4.tgz",
+                    "integrity": "sha512-K20DkRkUwDnxEYMBPcg3Y6voLkEy5p5QQmszZgLngKKiC7dzBR/aEuK3w1qlx2JWDUNH6FluahYdgR3BP+QbYw==",
                     "requires": {}
                 }
             }
@@ -26592,9 +26594,9 @@
             }
         },
         "@radix-ui/react-use-is-hydrated": {
-            "version": "0.1.1",
-            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.1.tgz",
-            "integrity": "sha512-qwOiz4Tjo8CNnrOLAYUMXeZwDzXgXpvK4TKQPmWLECM9XoWvA6+0Z2/7Ag3A4ivjS4ovbLJPbskkxioFyBhr8A==",
+            "version": "0.1.3",
+            "resolved": "https://registry.npmjs.org/@radix-ui/react-use-is-hydrated/-/react-use-is-hydrated-0.1.3.tgz",
+            "integrity": "sha512-umO/aJ+82CpOnhDZUTbILCQf7kU/g0iv+oGs/Q8jw7IkhWBzaEP4sA268PhFAJTFetbwp3ICc6ktpI4TqtxcIw==",
             "requires": {}
         },
         "@radix-ui/react-use-layout-effect": {
@@ -26740,9 +26742,9 @@
             "optional": true
         },
         "@sinclair/typebox": {
-            "version": "0.27.10",
-            "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.10.tgz",
-            "integrity": "sha512-MTBk/3jGLNB2tVxv6uLlFh1iu64iYOQ2PbdOSK3NW8JZsmlaOh2q6sdtKowBhfw8QFLmYNzTW4/oK4uATIi6ZA=="
+            "version": "0.27.12",
+            "resolved": "https://registry.npmjs.org/@sinclair/typebox/-/typebox-0.27.12.tgz",
+            "integrity": "sha512-hhyNJ+nbR6ZR7pToHvllEFun9TL0sbL+tk/ON75lo+Xas054uez98qRbsuNt7MBCyZKK4+8Yli/OAGZhmfBZ/g=="
         },
         "@sindresorhus/is": {
             "version": "4.6.0",
@@ -26897,9 +26899,9 @@
                     }
                 },
                 "brace-expansion": {
-                    "version": "2.1.2",
-                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.2.tgz",
-                    "integrity": "sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==",
+                    "version": "2.1.4",
+                    "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.1.4.tgz",
+                    "integrity": "sha512-hGfVzPxthbf3+2yjg/RBs60cB0FhqBS/zvdV/4wn4/BmN0bNMMHPc4V/BbFieqf1TKAGGAHnY4eSjajCl0f2Xg==",
                     "requires": {
                         "balanced-match": "^1.0.0"
                     }
@@ -27494,9 +27496,9 @@
             }
         },
         "@types/lodash": {
-            "version": "4.17.24",
-            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.24.tgz",
-            "integrity": "sha512-gIW7lQLZbue7lRSWEFql49QJJWThrTFFeIMJdp3eH4tKoxm1OvEPg02rm4wCCSHS0cL3/Fizimb35b7k8atwsQ=="
+            "version": "4.17.25",
+            "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.17.25.tgz",
+            "integrity": "sha512-+K1NIO8I+F9/wNulfVvu23QYd0Pe9/OCqRrim4NoYIf1VoEDL90Ve4ClzpyqBLc7NpGGWRvYNCKZ1BE/Jpf8dQ=="
         },
         "@types/mdx": {
             "version": "2.0.14",
@@ -36715,9 +36717,9 @@
             }
         },
         "react-colorful": {
-            "version": "5.7.0",
-            "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.7.0.tgz",
-            "integrity": "sha512-fuesYIemttah97XmsIHmz4OORDHiSFzyc9HMAIrCHJou2jaRQmL8cFJ76K4zQhhj8jzwOBlOi4BaGTjjOZCfTg==",
+            "version": "5.8.0",
+            "resolved": "https://registry.npmjs.org/react-colorful/-/react-colorful-5.8.0.tgz",
+            "integrity": "sha512-Wy9OzPfjSN9bF12OB8N7UQvlsZ0I+7wHxpN+bV5BjNQGxOj6IiwkRjevJK9yOBjJWGQvAaf1OXtn8rUeEatAng==",
             "requires": {}
         },
         "react-dom": {
@@ -36909,9 +36911,9 @@
             }
         },
         "recast": {
-            "version": "0.23.12",
-            "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.12.tgz",
-            "integrity": "sha512-dEWRjcINDu/F4l2dYx57ugBtD7HV9KXESyxhzw/MqWLeglJrsjJKqACPyUPg+6AF8mIgm+Zi0dZ3ACoIg+QtpA==",
+            "version": "0.23.19",
+            "resolved": "https://registry.npmjs.org/recast/-/recast-0.23.19.tgz",
+            "integrity": "sha512-T98lym7kH+pnZmRaD8yDRdaNqyUbwnbEBx0MuchrzMFOEMray4AO3ZJoTUZ5r78Ao78X/OhzW0DL8GB85w/I2w==",
             "requires": {
                 "ast-types": "^0.16.1",
                 "esprima": "~4.0.0",
@@ -38543,9 +38545,9 @@
             }
         },
         "synchronous-promise": {
-            "version": "2.0.17",
-            "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.17.tgz",
-            "integrity": "sha512-AsS729u2RHUfEra9xJrE39peJcc2stq2+poBXX8bcM08Y6g9j/i/PUzwNQqkaJde7Ntg1TO7bSREbR5sdosQ+g=="
+            "version": "2.0.18",
+            "resolved": "https://registry.npmjs.org/synchronous-promise/-/synchronous-promise-2.0.18.tgz",
+            "integrity": "sha512-4EEtGWYLkSoy/DjlKpHR6LT2AjmORt8HM+CUCSdKiKyuhL3PFBksgcTibSOj7JIoCvuqRVnZ7P9QFBMXR5kW6Q=="
         },
         "tailwindcss": {
             "version": "3.4.13",
diff --git a/package.json b/package.json
index 42cd7070a1..b047762fd9 100644
--- a/package.json
+++ b/package.json
@@ -61,10 +61,10 @@
         "@fortawesome/free-solid-svg-icons": "^5.15.1",
         "@fortawesome/vue-fontawesome": "^0.1.9",
         "@panter/vue-i18next": "^0.15.2",
-        "@processmaker/modeler": "1.69.42",
+        "@processmaker/modeler": "1.69.43",
         "@processmaker/processmaker-bpmn-moddle": "0.16.1",
-        "@processmaker/screen-builder": "3.8.36",
-        "@processmaker/vue-form-elements": "0.65.9",
+        "@processmaker/screen-builder": "3.8.37",
+        "@processmaker/vue-form-elements": "0.65.10",
         "@processmaker/vue-multiselect": "2.3.2",
         "@tinymce/tinymce-vue": "2.0.0",
         "axios": "^0.27.2",

From 7a49a98c6f12c19155ea30f3b6b9b24b355841ec Mon Sep 17 00:00:00 2001
From: ProcessMaker Bot <206180840+processmaker-bot@users.noreply.github.com>
Date: Mon, 3 Aug 2026 23:03:41 +0000
Subject: [PATCH 39/52] Version 2026.13.1

---
 composer.json     | 6 +++---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 0bd34886e4..1bd4939f7f 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "2026.12.3",
+    "version": "2026.13.1",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
@@ -116,7 +116,7 @@
             "Gmail"
         ],
         "processmaker": {
-            "build": "449111cb",
+            "build": "3f4181f9",
             "cicd-enabled": true,
             "custom": {
                 "package-ellucian-ethos": "1.19.10",
@@ -253,4 +253,4 @@
             "ignore": []
         }
     }
-}
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 1946a5d866..e98c94133d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@processmaker/processmaker",
-    "version": "2026.12.3",
+    "version": "2026.13.1",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@processmaker/processmaker",
-            "version": "2026.12.3",
+            "version": "2026.13.1",
             "hasInstallScript": true,
             "license": "ISC",
             "dependencies": {
diff --git a/package.json b/package.json
index b047762fd9..c8e8ee9704 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@processmaker/processmaker",
-    "version": "2026.12.3",
+    "version": "2026.13.1",
     "description": "ProcessMaker 4",
     "author": "DevOps <devops@processmaker.com>",
     "license": "ISC",

From c64b38b24cdb90242a262a4320d63e5fe5497ad3 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Mon, 3 Aug 2026 20:42:22 -0400
Subject: [PATCH 40/52] debug tests

---
 phpunit.xml                                  |  5 +-
 tests/Extensions/RealTimeOutputExtension.php | 60 ++++++++++++++++++++
 2 files changed, 64 insertions(+), 1 deletion(-)
 create mode 100644 tests/Extensions/RealTimeOutputExtension.php

diff --git a/phpunit.xml b/phpunit.xml
index 8c16d0ae0e..7cc898e9d0 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -7,7 +7,10 @@
          extensionsDirectory="tests/Extensions"
          displayDetailsOnAllIssues="true"
 >
-  <testsuites>
+    <extensions>
+        <bootstrap class="Tests\Extensions\RealTimeOutputExtension" />
+    </extensions>
+    <testsuites>
       <testsuite name="Features">
         <directory>tests/Feature</directory>
         <directory>tests/Managers</directory>
diff --git a/tests/Extensions/RealTimeOutputExtension.php b/tests/Extensions/RealTimeOutputExtension.php
new file mode 100644
index 0000000000..2816f91988
--- /dev/null
+++ b/tests/Extensions/RealTimeOutputExtension.php
@@ -0,0 +1,60 @@
+<?php
+
+namespace Tests\Extensions;
+
+use PHPUnit\Runner\Extension\Extension;
+use PHPUnit\Runner\Extension\Facade;
+use PHPUnit\Runner\Extension\ParameterCollection;
+use PHPUnit\TextUI\Configuration\Configuration;
+use PHPUnit\Event\Test\PreparationStarted;
+use PHPUnit\Event\Test\PreparationStartedSubscriber;
+use PHPUnit\Event\Test\Passed;
+use PHPUnit\Event\Test\PassedSubscriber;
+use PHPUnit\Event\Test\Failed;
+use PHPUnit\Event\Test\FailedSubscriber;
+use PHPUnit\Event\Test\Errored;
+use PHPUnit\Event\Test\ErroredSubscriber;
+use PHPUnit\Event\Test\Skipped;
+use PHPUnit\Event\Test\SkippedSubscriber;
+
+class RealTimeOutputExtension implements Extension
+{
+    public function bootstrap(Configuration $configuration, Facade $facade, ParameterCollection $parameters): void
+    {
+        $facade->registerSubscriber(new class implements PreparationStartedSubscriber {
+            public function notify(PreparationStarted $event): void
+            {
+                fwrite(STDERR, "\n\033[1;33m[START]\033[0m " . $event->test()->id() . "\n");
+            }
+        });
+
+        $facade->registerSubscriber(new class implements PassedSubscriber {
+            public function notify(Passed $event): void
+            {
+                fwrite(STDERR, "\033[1;32m[PASS]\033[0m  " . $event->test()->id() . "\n");
+            }
+        });
+
+        $facade->registerSubscriber(new class implements FailedSubscriber {
+            public function notify(Failed $event): void
+            {
+                fwrite(STDERR, "\033[1;31m[FAIL]\033[0m  " . $event->test()->id() . "\n");
+                // TESTING_VERBOSE will handle the trace, but we can add a small marker here if needed.
+            }
+        });
+
+        $facade->registerSubscriber(new class implements ErroredSubscriber {
+            public function notify(Errored $event): void
+            {
+                fwrite(STDERR, "\033[1;31m[ERROR]\033[0m " . $event->test()->id() . "\n");
+            }
+        });
+
+        $facade->registerSubscriber(new class implements SkippedSubscriber {
+            public function notify(Skipped $event): void
+            {
+                fwrite(STDERR, "\033[1;34m[SKIP]\033[0m  " . $event->test()->id() . "\n");
+            }
+        });
+    }
+}

From b1bbb34f7e60447eaffc4817b0db77702cc7e857 Mon Sep 17 00:00:00 2001
From: David Callizaya <davidcallizaya@gmail.com>
Date: Tue, 4 Aug 2026 12:06:31 -0400
Subject: [PATCH 41/52] ci: debug tests

---
 phpunit.xml                                  |   3 +
 tests/Extensions/RealTimeOutputExtension.php | 109 ++++++++++++++++---
 tests/TestCase.php                           |  14 +++
 3 files changed, 110 insertions(+), 16 deletions(-)

diff --git a/phpunit.xml b/phpunit.xml
index 7cc898e9d0..6d8310e71c 100644
--- a/phpunit.xml
+++ b/phpunit.xml
@@ -27,6 +27,9 @@
         </include>
     </source>
     <php>
+      <!-- Prevent Redis/DNS/TCP from hanging the suite for hours -->
+      <ini name="default_socket_timeout" value="15"/>
+
       <env name="APP_DEBUG" value="true" />
       <env name="APP_ENV" value="testing" />
       <env name="APP_URL" value="http://localhost" />
diff --git a/tests/Extensions/RealTimeOutputExtension.php b/tests/Extensions/RealTimeOutputExtension.php
index 2816f91988..8a317305b7 100644
--- a/tests/Extensions/RealTimeOutputExtension.php
+++ b/tests/Extensions/RealTimeOutputExtension.php
@@ -2,59 +2,136 @@
 
 namespace Tests\Extensions;
 
-use PHPUnit\Runner\Extension\Extension;
-use PHPUnit\Runner\Extension\Facade;
-use PHPUnit\Runner\Extension\ParameterCollection;
-use PHPUnit\TextUI\Configuration\Configuration;
-use PHPUnit\Event\Test\PreparationStarted;
-use PHPUnit\Event\Test\PreparationStartedSubscriber;
-use PHPUnit\Event\Test\Passed;
-use PHPUnit\Event\Test\PassedSubscriber;
-use PHPUnit\Event\Test\Failed;
-use PHPUnit\Event\Test\FailedSubscriber;
 use PHPUnit\Event\Test\Errored;
 use PHPUnit\Event\Test\ErroredSubscriber;
+use PHPUnit\Event\Test\Failed;
+use PHPUnit\Event\Test\FailedSubscriber;
+use PHPUnit\Event\Test\Passed;
+use PHPUnit\Event\Test\PassedSubscriber;
+use PHPUnit\Event\Test\PreparationStarted;
+use PHPUnit\Event\Test\PreparationStartedSubscriber;
+use PHPUnit\Event\Test\Prepared;
+use PHPUnit\Event\Test\PreparedSubscriber;
 use PHPUnit\Event\Test\Skipped;
 use PHPUnit\Event\Test\SkippedSubscriber;
+use PHPUnit\Runner\Extension\Extension;
+use PHPUnit\Runner\Extension\Facade;
+use PHPUnit\Runner\Extension\ParameterCollection;
+use PHPUnit\TextUI\Configuration\Configuration;
 
 class RealTimeOutputExtension implements Extension
 {
+    /** @var array<string, float> */
+    private static array $startedAt = [];
+
+    /** @var array<string, float> */
+    private static array $preparedAt = [];
+
     public function bootstrap(Configuration $configuration, Facade $facade, ParameterCollection $parameters): void
     {
         $facade->registerSubscriber(new class implements PreparationStartedSubscriber {
             public function notify(PreparationStarted $event): void
             {
-                fwrite(STDERR, "\n\033[1;33m[START]\033[0m " . $event->test()->id() . "\n");
+                $id = $event->test()->id();
+                RealTimeOutputExtension::markStarted($id);
+                RealTimeOutputExtension::write('START', $id, "\033[1;33m", true);
+            }
+        });
+
+        $facade->registerSubscriber(new class implements PreparedSubscriber {
+            public function notify(Prepared $event): void
+            {
+                $id = $event->test()->id();
+                RealTimeOutputExtension::markPrepared($id);
+                $setupDuration = RealTimeOutputExtension::elapsedSinceStart($id);
+                RealTimeOutputExtension::write(
+                    'PREPARED',
+                    $id,
+                    "\033[1;36m",
+                    false,
+                    $setupDuration !== null ? sprintf('setup=%.2fs', $setupDuration) : null
+                );
             }
         });
 
         $facade->registerSubscriber(new class implements PassedSubscriber {
             public function notify(Passed $event): void
             {
-                fwrite(STDERR, "\033[1;32m[PASS]\033[0m  " . $event->test()->id() . "\n");
+                RealTimeOutputExtension::writeFinished('PASS', $event->test()->id(), "\033[1;32m");
             }
         });
 
         $facade->registerSubscriber(new class implements FailedSubscriber {
             public function notify(Failed $event): void
             {
-                fwrite(STDERR, "\033[1;31m[FAIL]\033[0m  " . $event->test()->id() . "\n");
-                // TESTING_VERBOSE will handle the trace, but we can add a small marker here if needed.
+                RealTimeOutputExtension::writeFinished('FAIL', $event->test()->id(), "\033[1;31m");
             }
         });
 
         $facade->registerSubscriber(new class implements ErroredSubscriber {
             public function notify(Errored $event): void
             {
-                fwrite(STDERR, "\033[1;31m[ERROR]\033[0m " . $event->test()->id() . "\n");
+                RealTimeOutputExtension::writeFinished('ERROR', $event->test()->id(), "\033[1;31m");
             }
         });
 
         $facade->registerSubscriber(new class implements SkippedSubscriber {
             public function notify(Skipped $event): void
             {
-                fwrite(STDERR, "\033[1;34m[SKIP]\033[0m  " . $event->test()->id() . "\n");
+                RealTimeOutputExtension::writeFinished('SKIP', $event->test()->id(), "\033[1;34m");
             }
         });
     }
+
+    public static function markStarted(string $id): void
+    {
+        self::$startedAt[$id] = microtime(true);
+        unset(self::$preparedAt[$id]);
+    }
+
+    public static function markPrepared(string $id): void
+    {
+        self::$preparedAt[$id] = microtime(true);
+    }
+
+    public static function elapsedSinceStart(string $id): ?float
+    {
+        if (!isset(self::$startedAt[$id])) {
+            return null;
+        }
+
+        return microtime(true) - self::$startedAt[$id];
+    }
+
+    public static function writeFinished(string $label, string $id, string $color): void
+    {
+        $total = self::elapsedSinceStart($id);
+        $body = null;
+        if ($total !== null) {
+            $body = sprintf('total=%.2fs', $total);
+            if (isset(self::$preparedAt[$id])) {
+                $body .= sprintf(' body=%.2fs', microtime(true) - self::$preparedAt[$id]);
+            }
+        }
+
+        self::write($label, $id, $color, false, $body);
+        unset(self::$startedAt[$id], self::$preparedAt[$id]);
+    }
+
+    public static function write(string $label, string $id, string $color, bool $leadingNewline = false, ?string $extra = null): void
+    {
+        $timestamp = date('H:i:s');
+        $prefix = $leadingNewline ? "\n" : '';
+        $suffix = $extra ? " ({$extra})" : '';
+        fwrite(STDERR, sprintf(
+            "%s%s[%s]%s [%s] %s%s\n",
+            $prefix,
+            $color,
+            $label,
+            "\033[0m",
+            $timestamp,
+            $id,
+            $suffix
+        ));
+    }
 }
diff --git a/tests/TestCase.php b/tests/TestCase.php
index fce7ee220d..587ba3b53f 100644
--- a/tests/TestCase.php
+++ b/tests/TestCase.php
@@ -72,7 +72,21 @@ protected function setUp(): void
 
         // Clear Redis cache before running tests
         foreach (['default', 'cache', 'cache_settings'] as $connection) {
+            if (env('TESTING_SETUP_TRACE')) {
+                fwrite(STDERR, sprintf(
+                    "\033[1;35m[SETUP]\033[0m [%s] Redis flushDb(%s) start\n",
+                    date('H:i:s'),
+                    $connection
+                ));
+            }
             Redis::connection($connection)->flushDb();
+            if (env('TESTING_SETUP_TRACE')) {
+                fwrite(STDERR, sprintf(
+                    "\033[1;35m[SETUP]\033[0m [%s] Redis flushDb(%s) done\n",
+                    date('H:i:s'),
+                    $connection
+                ));
+            }
         }
 
         if (!self::$cacheCleared) {

From e7c35ab682ad05d7406183d017293d8f767d4b90 Mon Sep 17 00:00:00 2001
From: Gustavo Silva <gustavo.silva@processmaker.com>
Date: Tue, 4 Aug 2026 12:19:54 -0400
Subject: [PATCH 42/52] Create custom executor in microservice after import

---
 .../Exporters/ScriptExecutorExporter.php      | 13 +++++++--
 .../Jobs/MoveScriptExecutorToMicroservice.php | 27 +++++++++++++++++++
 2 files changed, 38 insertions(+), 2 deletions(-)
 create mode 100644 ProcessMaker/Jobs/MoveScriptExecutorToMicroservice.php

diff --git a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php
index 0f3e8a1444..7f19142a6f 100644
--- a/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php
+++ b/ProcessMaker/ImportExport/Exporters/ScriptExecutorExporter.php
@@ -5,6 +5,7 @@
 use Illuminate\Support\Facades\Auth;
 use ProcessMaker\Events\ScriptExecutorUpdated;
 use ProcessMaker\Jobs\BuildScriptExecutor;
+use ProcessMaker\Jobs\MoveScriptExecutorToMicroservice;
 use ProcessMaker\Models\ScriptExecutor;
 use ProcessMaker\Models\User;
 
@@ -28,7 +29,11 @@ public function import() : bool
             case 'copy':
             case 'new':
                 // afterCommit is needed because we are in a db transaction
-                BuildScriptExecutor::dispatch($this->model->id, $userId)->afterCommit();
+                if (!config('script-runner-microservice.enabled')) {
+                    BuildScriptExecutor::dispatch($this->model->id, $userId)->afterCommit();
+                } else {
+                    MoveScriptExecutorToMicroservice::dispatch($this->model->uuid)->afterCommit();
+                }
                 break;
             case 'update':
                 if (!empty($this->model->getChanges())) {
@@ -40,7 +45,11 @@ public function import() : bool
                         $user = User::where('is_administrator', 1)->first();
                     }
                     // afterCommit is needed because we are in a db transaction
-                    BuildScriptExecutor::dispatch($this->model->id, $user->id)->afterCommit();
+                    if (!config('script-runner-microservice.enabled')) {
+                        BuildScriptExecutor::dispatch($this->model->id, $userId)->afterCommit();
+                    } else {
+                        MoveScriptExecutorToMicroservice::dispatch($this->model->uuid)->afterCommit();
+                    }
                 }
                 break;
 
diff --git a/ProcessMaker/Jobs/MoveScriptExecutorToMicroservice.php b/ProcessMaker/Jobs/MoveScriptExecutorToMicroservice.php
new file mode 100644
index 0000000000..584b7b6f01
--- /dev/null
+++ b/ProcessMaker/Jobs/MoveScriptExecutorToMicroservice.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace ProcessMaker\Jobs;
+
+use Illuminate\Contracts\Queue\ShouldQueue;
+use Illuminate\Foundation\Queue\Queueable;
+
+class MoveScriptExecutorToMicroservice implements ShouldQueue
+{
+    use Queueable;
+
+    /**
+     * Create a new job instance.
+     */
+    public function __construct(protected string $uuid)
+    {
+        //
+    }
+
+    /**
+     * Execute the job.
+     */
+    public function handle(): void
+    {
+        \Artisan::call('processmaker:transition-executors --uuid=' . $this->uuid );
+    }
+}

From 2fbb3794359df7691188f8731ef4c9a1a9dbb96a Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigoquelca@gmail.com>
Date: Fri, 19 Jun 2026 09:41:05 -0400
Subject: [PATCH 43/52] feat(FOUR-31695): solving conflicts

---
 .gitignore                                    |   5 +-
 .../Repositories/SettingsConfigRepository.php |   2 +-
 composer.json                                 |   7 +-
 composer.lock                                 | 177 ++++++++++++++++++
 4 files changed, 186 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index 7a47d39bab..f30ac80d98 100644
--- a/.gitignore
+++ b/.gitignore
@@ -51,4 +51,7 @@ devhub/pm-font/dist
 test-db-snapshot.db
 snapshot_*.db
 storage/transitions
-.envrc
\ No newline at end of file
+.envrc
+**/caddy
+frankenphp
+frankenphp-worker.php
diff --git a/ProcessMaker/Repositories/SettingsConfigRepository.php b/ProcessMaker/Repositories/SettingsConfigRepository.php
index 2f4cf6e0b2..f2707faf2f 100644
--- a/ProcessMaker/Repositories/SettingsConfigRepository.php
+++ b/ProcessMaker/Repositories/SettingsConfigRepository.php
@@ -39,7 +39,7 @@ public function get($key, $default = null)
         if ($key === 'session.lifetime') {
             $settingValue = $this->getFromSettings($key);
 
-            return $settingValue ?? $default;
+            return $settingValue ?: Arr::get($this->items, $key) ?: $default ?: 120;
         }
 
         if (Arr::has($this->items, $key)) {
diff --git a/composer.json b/composer.json
index 1bd4939f7f..474148e089 100644
--- a/composer.json
+++ b/composer.json
@@ -25,8 +25,9 @@
         "guzzlehttp/psr7": "^2.12.3",
         "igaster/laravel-theme": "^2.0",
         "jenssegers/agent": "^2.6",
-        "laravel/framework": "^13.13",
-        "laravel/horizon": "^5.47",
+        "laravel/framework": "^13.0",
+        "laravel/horizon": "^5.45",
+        "laravel/octane": "^2.17",
         "laravel/pail": "^1.2",
         "laravel/passport": "^13.7",
         "laravel/scout": "^11.1",
@@ -253,4 +254,4 @@
             "ignore": []
         }
     }
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 7424e10bfa..b507253c75 100644
--- a/composer.lock
+++ b/composer.lock
@@ -2896,6 +2896,94 @@
             ],
             "time": "2020-06-13T08:05:20+00:00"
         },
+        {
+            "name": "laminas/laminas-diactoros",
+            "version": "3.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laminas/laminas-diactoros.git",
+                "reference": "60c182916b2749480895601649563970f3f12ec4"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laminas/laminas-diactoros/zipball/60c182916b2749480895601649563970f3f12ec4",
+                "reference": "60c182916b2749480895601649563970f3f12ec4",
+                "shasum": ""
+            },
+            "require": {
+                "php": "~8.2.0 || ~8.3.0 || ~8.4.0 || ~8.5.0",
+                "psr/http-factory": "^1.1",
+                "psr/http-message": "^1.1 || ^2.0"
+            },
+            "conflict": {
+                "amphp/amp": "<2.6.4"
+            },
+            "provide": {
+                "psr/http-factory-implementation": "^1.0",
+                "psr/http-message-implementation": "^1.1 || ^2.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "ext-dom": "*",
+                "ext-gd": "*",
+                "ext-libxml": "*",
+                "http-interop/http-factory-tests": "^2.2.0",
+                "laminas/laminas-coding-standard": "~3.1.0",
+                "php-http/psr7-integration-tests": "^1.4.0",
+                "phpunit/phpunit": "^10.5.36",
+                "psalm/plugin-phpunit": "^0.19.5",
+                "vimeo/psalm": "^6.13"
+            },
+            "type": "library",
+            "extra": {
+                "laminas": {
+                    "module": "Laminas\\Diactoros",
+                    "config-provider": "Laminas\\Diactoros\\ConfigProvider"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions/create_uploaded_file.php",
+                    "src/functions/marshal_headers_from_sapi.php",
+                    "src/functions/marshal_method_from_sapi.php",
+                    "src/functions/marshal_protocol_version_from_sapi.php",
+                    "src/functions/normalize_server.php",
+                    "src/functions/normalize_uploaded_files.php",
+                    "src/functions/parse_cookie_header.php"
+                ],
+                "psr-4": {
+                    "Laminas\\Diactoros\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "BSD-3-Clause"
+            ],
+            "description": "PSR HTTP Message implementations",
+            "homepage": "https://laminas.dev",
+            "keywords": [
+                "http",
+                "laminas",
+                "psr",
+                "psr-17",
+                "psr-7"
+            ],
+            "support": {
+                "chat": "https://laminas.dev/chat",
+                "docs": "https://docs.laminas.dev/laminas-diactoros/",
+                "forum": "https://discourse.laminas.dev",
+                "issues": "https://github.com/laminas/laminas-diactoros/issues",
+                "rss": "https://github.com/laminas/laminas-diactoros/releases.atom",
+                "source": "https://github.com/laminas/laminas-diactoros"
+            },
+            "funding": [
+                {
+                    "url": "https://funding.communitybridge.org/projects/laminas-project",
+                    "type": "community_bridge"
+                }
+            ],
+            "time": "2025-10-12T15:31:36+00:00"
+        },
         {
             "name": "laravel/framework",
             "version": "v13.13.0",
@@ -3200,6 +3288,95 @@
             },
             "time": "2026-06-03T15:11:37+00:00"
         },
+        {
+            "name": "laravel/octane",
+            "version": "v2.17.5",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/laravel/octane.git",
+                "reference": "058ae4d7109eed40836dc42960f9388b9bf71f73"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/laravel/octane/zipball/058ae4d7109eed40836dc42960f9388b9bf71f73",
+                "reference": "058ae4d7109eed40836dc42960f9388b9bf71f73",
+                "shasum": ""
+            },
+            "require": {
+                "laminas/laminas-diactoros": "^3.0",
+                "laravel/framework": "^10.10.1|^11.0|^12.0|^13.0",
+                "laravel/prompts": "^0.1.24|^0.2.0|^0.3.0",
+                "laravel/serializable-closure": "^1.3|^2.0",
+                "nesbot/carbon": "^2.66.0|^3.0",
+                "php": "^8.1.0",
+                "symfony/console": "^6.0|^7.0|^8.0",
+                "symfony/psr-http-message-bridge": "^2.2.0|^6.4|^7.0|^8.0"
+            },
+            "conflict": {
+                "spiral/roadrunner": "<2023.1.0",
+                "spiral/roadrunner-cli": "<2.6.0",
+                "spiral/roadrunner-http": "<3.3.0"
+            },
+            "require-dev": {
+                "guzzlehttp/guzzle": "^7.6.1",
+                "inertiajs/inertia-laravel": "^1.3.2|^2.0",
+                "laravel/scout": "^10.2.1",
+                "laravel/socialite": "^5.6.1",
+                "livewire/livewire": "^2.12.3|^3.0",
+                "nunomaduro/collision": "^6.4.0|^7.5.2|^8.0",
+                "orchestra/testbench": "^8.21|^9.0|^10.0|^11.0",
+                "phpstan/phpstan": "^2.1.7",
+                "phpunit/phpunit": "^10.4|^11.5|^12.0|^13.0",
+                "spiral/roadrunner-cli": "^2.6.0",
+                "spiral/roadrunner-http": "^3.3.0"
+            },
+            "bin": [
+                "bin/roadrunner-worker",
+                "bin/swoole-server"
+            ],
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "aliases": {
+                        "Octane": "Laravel\\Octane\\Facades\\Octane"
+                    },
+                    "providers": [
+                        "Laravel\\Octane\\OctaneServiceProvider"
+                    ]
+                },
+                "branch-alias": {
+                    "dev-master": "2.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Laravel\\Octane\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Taylor Otwell",
+                    "email": "taylor@laravel.com"
+                }
+            ],
+            "description": "Supercharge your Laravel application's performance.",
+            "keywords": [
+                "frankenphp",
+                "laravel",
+                "octane",
+                "roadrunner",
+                "swoole"
+            ],
+            "support": {
+                "issues": "https://github.com/laravel/octane/issues",
+                "source": "https://github.com/laravel/octane"
+            },
+            "time": "2026-06-04T09:05:08+00:00"
+        },
         {
             "name": "laravel/pail",
             "version": "v1.2.6",

From f4126faafa22b3c8327a0e677473bfb13fe21de6 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigoquelca@gmail.com>
Date: Fri, 26 Jun 2026 08:41:15 -0400
Subject: [PATCH 44/52] feat(FOUR-32024): review and fix the calculation of DB
 timing when loaded by octane

---
 .../Middleware/ServerTimingMiddleware.php     |  2 ++
 .../Providers/ProcessMakerServiceProvider.php |  8 +++++++
 tests/Feature/ServerTimingMiddlewareTest.php  | 24 +++++++++++++++++++
 3 files changed, 34 insertions(+)

diff --git a/ProcessMaker/Http/Middleware/ServerTimingMiddleware.php b/ProcessMaker/Http/Middleware/ServerTimingMiddleware.php
index 96ade2bded..2a15e84a6d 100644
--- a/ProcessMaker/Http/Middleware/ServerTimingMiddleware.php
+++ b/ProcessMaker/Http/Middleware/ServerTimingMiddleware.php
@@ -28,6 +28,8 @@ public function handle(Request $request, Closure $next): Response
             return $next($request);
         }
 
+        ProcessMakerServiceProvider::beginRequestTiming();
+
         // Start time for controller execution
         $startController = microtime(true);
 
diff --git a/ProcessMaker/Providers/ProcessMakerServiceProvider.php b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
index 762fd6cd0b..706bba7625 100644
--- a/ProcessMaker/Providers/ProcessMakerServiceProvider.php
+++ b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
@@ -511,6 +511,14 @@ public static function getBootTime(): ?float
         return self::$bootTime;
     }
 
+    /**
+     * Reset per-request query timing metrics.
+     */
+    public static function beginRequestTiming(): void
+    {
+        self::$queryTime = 0;
+    }
+
     /**
      * Get the query time for the request.
      *
diff --git a/tests/Feature/ServerTimingMiddlewareTest.php b/tests/Feature/ServerTimingMiddlewareTest.php
index b9449ebfed..040401d227 100644
--- a/tests/Feature/ServerTimingMiddlewareTest.php
+++ b/tests/Feature/ServerTimingMiddlewareTest.php
@@ -6,6 +6,8 @@
 use Illuminate\Support\Facades\Route;
 use ProcessMaker\Http\Middleware\ServerTimingMiddleware;
 use ProcessMaker\Models\User;
+use ProcessMaker\Providers\ProcessMakerServiceProvider;
+use ReflectionClass;
 use Tests\Feature\Shared\RequestHelper;
 use Tests\TestCase;
 
@@ -41,6 +43,28 @@ public function testServerTimingHeaderIncludesAllMetrics()
         $this->assertStringContainsString('db;dur=', $serverTiming[2]);
     }
 
+    public function testBeginRequestTimingClearsAccumulatedQueryTime()
+    {
+        $reflection = new ReflectionClass(ProcessMakerServiceProvider::class);
+        $property = $reflection->getProperty('queryTime');
+        $property->setAccessible(true);
+        $property->setValue(null, 500);
+
+        Route::middleware(ServerTimingMiddleware::class)->get('/timing-reset-test', function () {
+            DB::select('SELECT 1');
+
+            return response()->json(['message' => 'Timing reset test']);
+        });
+
+        $response = $this->get('/timing-reset-test');
+        $serverTiming = $this->getHeader($response, 'server-timing');
+
+        preg_match('/db;dur=([\d.]+)/', implode(',', $serverTiming), $matches);
+        $dbTime = (float) ($matches[1] ?? 500);
+
+        $this->assertLessThan(500, $dbTime);
+    }
+
     public function testQueryTimeIsMeasured()
     {
         // Mock a route with a query

From 1a44a4e1ec0803410cc88665ee0e105d2b810148 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigoquelca@gmail.com>
Date: Wed, 29 Jul 2026 10:11:13 -0400
Subject: [PATCH 45/52] feat(FOUR-32353): solving conflicts

---
 .env.dusk.testing                             |  2 +
 .env.example                                  |  3 ++
 .../Listeners/HandleRedirectListener.php      | 11 +++++
 .../Providers/ProcessMakerServiceProvider.php | 48 +++++++++++++++++++
 config/app.php                                |  4 ++
 config/octane.php                             | 32 +++++++++++++
 6 files changed, 100 insertions(+)
 create mode 100644 config/octane.php

diff --git a/.env.dusk.testing b/.env.dusk.testing
index 7b284846d8..a5434bf44a 100644
--- a/.env.dusk.testing
+++ b/.env.dusk.testing
@@ -17,6 +17,8 @@ DATA_DB_PASSWORD=secret
 
 APP_URL=http://127.0.0.1
 
+OCTANE_ENABLED=false
+
 SAUCELABS_BROWSER_TESTING=false
 SAUCELABS_USERNAME=processmaker
 SAUCELABS_ACCESS_KEY=eb78836b-b7c9-4800-95b4-69ef4be96106
diff --git a/.env.example b/.env.example
index c3a094135c..38cd7f8cfb 100644
--- a/.env.example
+++ b/.env.example
@@ -70,3 +70,6 @@ KEYCLOAK_CLIENT_SECRET=
 KEYCLOAK_BASE_URL=
 KEYCLOAK_USERNAME=
 KEYCLOAK_PASSWORD=
+# Enable Octane compatibility listeners when running under `php artisan octane:start`
+OCTANE_ENABLED=false
+OCTANE_MAX_REQUESTS=500
diff --git a/ProcessMaker/Listeners/HandleRedirectListener.php b/ProcessMaker/Listeners/HandleRedirectListener.php
index 78491809a4..7679a73572 100644
--- a/ProcessMaker/Listeners/HandleRedirectListener.php
+++ b/ProcessMaker/Listeners/HandleRedirectListener.php
@@ -20,6 +20,17 @@ protected function setRedirectTo(ProcessRequest $processRequest, string $method,
         self::$redirectionParams = $params;
     }
 
+    /**
+     * Reset the static state for Octane compatibility.
+     * This prevents data leaks between requests in long-running workers.
+     */
+    public static function reset(): void
+    {
+        self::$processRequest = null;
+        self::$redirectionMethod = '';
+        self::$redirectionParams = [];
+    }
+
     public static function sendRedirectToEvent()
     {
         $method = self::$redirectionMethod;
diff --git a/ProcessMaker/Providers/ProcessMakerServiceProvider.php b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
index 706bba7625..331ae6d2a7 100644
--- a/ProcessMaker/Providers/ProcessMakerServiceProvider.php
+++ b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
@@ -43,6 +43,7 @@
 use ProcessMaker\ImportExport\SignalHelper;
 use ProcessMaker\Jobs\SmartInbox;
 use ProcessMaker\LicensedPackageManifest;
+use ProcessMaker\Listeners\HandleRedirectListener;
 use ProcessMaker\Managers;
 use ProcessMaker\Managers\MenuManager;
 use ProcessMaker\Managers\ScreenCompiledManager;
@@ -107,6 +108,9 @@ public function boot(): void
 
         $this->checkConfigCache();
 
+        // Register Octane listeners if Octane is enabled
+        $this->registerOctaneListeners();
+
         // Hook after service providers boot
         self::$bootTime = (microtime(true) - self::$bootStart) * 1000; // Convert to milliseconds
     }
@@ -529,6 +533,15 @@ public static function getQueryTime(): float
         return self::$queryTime;
     }
 
+    /**
+     * Reset the query time for Octane compatibility.
+     * This prevents timing metrics from leaking between requests.
+     */
+    public static function resetQueryTime(): void
+    {
+        self::$queryTime = 0;
+    }
+
     /**
      * Set the boot time for service providers.
      *
@@ -576,6 +589,41 @@ public static function getPackageBootTiming(): array
         return self::$packageBootTiming;
     }
 
+    /**
+     * Register Octane-specific listeners for request lifecycle management.
+     *
+     * When OCTANE_ENABLED is true, this method registers:
+     * - A 'requestHandled' listener to reset per-request static state
+     * - A flush list for stateful singletons
+     * - A tick listener for memory monitoring
+     */
+    private function registerOctaneListeners(): void
+    {
+        if (!config('app.octane_enabled', false) || !class_exists('\Laravel\Octane\Octane')) {
+            return;
+        }
+
+        $octane = \Laravel\Octane\Octane::class;
+
+        // Reset per-request static state after each request
+        $octane::on('requestHandled', function ($request, $result) {
+            self::resetQueryTime();
+            HandleRedirectListener::reset();
+        });
+
+        // Flush stateful singletons per request
+        $octane::flush(config('octane.flush', []));
+
+        // Monitor memory usage every 30 seconds
+        $octane::tick('octane-memory-monitor', function () {
+            $memory = memory_get_usage(true);
+            $threshold = 128 * 1024 * 1024; // 128MB
+            if ($memory > $threshold) {
+                Log::warning('Octane worker memory high: ' . round($memory / 1024 / 1024, 2) . 'MB');
+            }
+        })->seconds(30);
+    }
+
     /**
      * Find the tenant based on the environment variable
      */
diff --git a/config/app.php b/config/app.php
index b3c5891f98..72088b34ab 100644
--- a/config/app.php
+++ b/config/app.php
@@ -266,6 +266,10 @@
 
     'force_https' => env('FORCE_HTTPS', true),
 
+    // Enable Octane compatibility listeners when running under `php artisan octane:start`.
+    'octane_enabled' => filter_var(env('OCTANE_ENABLED', false), FILTER_VALIDATE_BOOLEAN),
+    'octane_max_requests' => (int) env('OCTANE_MAX_REQUESTS', 500),
+
     'nayra_docker_network' => env('NAYRA_DOCKER_NETWORK', 'host'),
     'nayra_port' => env('NAYRA_PORT', 8080),
 
diff --git a/config/octane.php b/config/octane.php
new file mode 100644
index 0000000000..13fe63eb5e
--- /dev/null
+++ b/config/octane.php
@@ -0,0 +1,32 @@
+<?php
+
+return [
+    /*
+    |--------------------------------------------------------------------------
+    | Octane Flush & Warm Lists
+    |--------------------------------------------------------------------------
+    |
+    | 'flush' — Services with mutable state that must be recreated per request.
+    |           These singletons will be flushed (re-bound) on each request
+    |           when OCTANE_ENABLED=true.
+    |
+    | 'warm'  — Services to pre-resolve once when an Octane worker starts,
+    |           avoiding lazy-resolution overhead on the first request.
+    |
+    */
+
+    'flush' => [
+        // Services with mutable state that must be recreated per request
+        ProcessMaker\Models\AnonymousUser::class,
+        ProcessMaker\ImportExport\Extension::class,
+        ProcessMaker\ImportExport\SignalHelper::class,
+        ProcessMaker\Managers\MenuManager::class,
+    ],
+
+    'warm' => [
+        // Services to pre-resolve on worker start
+        ProcessMaker\Managers\PackageManager::class,
+        ProcessMaker\Managers\LoginManager::class,
+        ProcessMaker\Managers\IndexManager::class,
+    ],
+];

From c7bb47d861a2ffa48d533223ae86d29e8e9cdb80 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigoquelca@gmail.com>
Date: Wed, 29 Jul 2026 11:02:25 -0400
Subject: [PATCH 46/52] feat(FOUR-32353): solving conflicts

---
 .env.dusk.testing                             |  2 -
 .env.example                                  |  3 --
 .../Providers/ProcessMakerServiceProvider.php | 45 +++++++------------
 config/app.php                                |  4 --
 config/octane.php                             |  4 +-
 5 files changed, 19 insertions(+), 39 deletions(-)

diff --git a/.env.dusk.testing b/.env.dusk.testing
index a5434bf44a..7b284846d8 100644
--- a/.env.dusk.testing
+++ b/.env.dusk.testing
@@ -17,8 +17,6 @@ DATA_DB_PASSWORD=secret
 
 APP_URL=http://127.0.0.1
 
-OCTANE_ENABLED=false
-
 SAUCELABS_BROWSER_TESTING=false
 SAUCELABS_USERNAME=processmaker
 SAUCELABS_ACCESS_KEY=eb78836b-b7c9-4800-95b4-69ef4be96106
diff --git a/.env.example b/.env.example
index 38cd7f8cfb..c3a094135c 100644
--- a/.env.example
+++ b/.env.example
@@ -70,6 +70,3 @@ KEYCLOAK_CLIENT_SECRET=
 KEYCLOAK_BASE_URL=
 KEYCLOAK_USERNAME=
 KEYCLOAK_PASSWORD=
-# Enable Octane compatibility listeners when running under `php artisan octane:start`
-OCTANE_ENABLED=false
-OCTANE_MAX_REQUESTS=500
diff --git a/ProcessMaker/Providers/ProcessMakerServiceProvider.php b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
index 331ae6d2a7..c4d09de820 100644
--- a/ProcessMaker/Providers/ProcessMakerServiceProvider.php
+++ b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
@@ -17,12 +17,14 @@
 use Illuminate\Support\Facades\Artisan;
 use Illuminate\Support\Facades\Context;
 use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Event;
 use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Route;
 use Illuminate\Support\Facades\URL;
 use Laravel\Horizon\Horizon;
 use Laravel\Horizon\SystemProcessCounter;
 use Laravel\Horizon\WorkerCommandString;
+use Laravel\Octane\Events\RequestTerminated;
 use Laravel\Passport\Client as PassportClient;
 use Lavary\Menu\Menu;
 use OpenApi\Analysers\AttributeAnnotationFactory;
@@ -264,7 +266,7 @@ protected static function registerEvents(): void
     {
         // Listen to the events for our core screen
         // types and add our javascript
-        Facades\Event::listen(ScreenBuilderStarting::class, function ($event) {
+        Event::listen(ScreenBuilderStarting::class, function ($event) {
             // Add any extensions to form builder
             // and renderer from packages
             $event->manager->addPackageScripts($event->type);
@@ -283,7 +285,7 @@ protected static function registerEvents(): void
         });
 
         // Log Notifications
-        Facades\Event::listen(NotificationSent::class, function ($event) {
+        Event::listen(NotificationSent::class, function ($event) {
             $id = $event->notifiable->id;
             $notifiable = get_class($event->notifiable);
             $notification = get_class($event->notification);
@@ -292,24 +294,24 @@ protected static function registerEvents(): void
         });
 
         // Log Broadcasts (messages sent to laravel-echo-server and redis)
-        Facades\Event::listen(BroadcastNotificationCreated::class, function ($event) {
+        Event::listen(BroadcastNotificationCreated::class, function ($event) {
             $channels = implode(', ', $event->broadcastOn());
 
             Log::debug('Broadcasting Notification ' . $event->broadcastType() . 'on channel(s) ' . $channels);
         });
 
         // Fire job when task is assigned to a user
-        Facades\Event::listen(ActivityAssigned::class, function ($event) {
+        Event::listen(ActivityAssigned::class, function ($event) {
             $task_id = $event->getProcessRequestToken()->id;
             // Dispatch the SmartInbox job with the processRequestToken as parameter
             SmartInbox::dispatch($task_id);
         });
 
-        Facades\Event::listen(MadeTenantCurrentEvent::class, function ($event) {
+        Event::listen(MadeTenantCurrentEvent::class, function ($event) {
             event(new TenantResolved($event->tenant));
         });
 
-        Facades\Event::listen(TenantNotFoundForRequestEvent::class, function ($event) {
+        Event::listen(TenantNotFoundForRequestEvent::class, function ($event) {
             if (config('app.multitenancy') === false || self::actuallyRunningInConsole()) {
                 // This is expected if multitenancy is disabled.
                 // We also need to check if we are running in a console command because
@@ -334,7 +336,7 @@ protected static function registerEvents(): void
             }
         });
 
-        Facades\Event::listen(function (CommandStarting $event) {
+        Event::listen(function (CommandStarting $event) {
             if ($event->command === 'l5-swagger:generate') {
                 // Set the analyser to use the legacy DocBlockAnnotationFactory. This must
                 // be set here because this config value is not serializable and cannot be cached.
@@ -590,38 +592,23 @@ public static function getPackageBootTiming(): array
     }
 
     /**
-     * Register Octane-specific listeners for request lifecycle management.
+     * Reset per-request static state between Octane requests.
      *
-     * When OCTANE_ENABLED is true, this method registers:
-     * - A 'requestHandled' listener to reset per-request static state
-     * - A flush list for stateful singletons
-     * - A tick listener for memory monitoring
+     * Octane workers stay alive across requests, so static properties must be
+     * cleared to avoid leaking data from one request into the next. Singletons
+     * holding mutable state are handled by the 'flush' list in config/octane.php,
+     * which Octane applies on its own.
      */
     private function registerOctaneListeners(): void
     {
-        if (!config('app.octane_enabled', false) || !class_exists('\Laravel\Octane\Octane')) {
+        if (!class_exists(RequestTerminated::class)) {
             return;
         }
 
-        $octane = \Laravel\Octane\Octane::class;
-
-        // Reset per-request static state after each request
-        $octane::on('requestHandled', function ($request, $result) {
+        Event::listen(RequestTerminated::class, function () {
             self::resetQueryTime();
             HandleRedirectListener::reset();
         });
-
-        // Flush stateful singletons per request
-        $octane::flush(config('octane.flush', []));
-
-        // Monitor memory usage every 30 seconds
-        $octane::tick('octane-memory-monitor', function () {
-            $memory = memory_get_usage(true);
-            $threshold = 128 * 1024 * 1024; // 128MB
-            if ($memory > $threshold) {
-                Log::warning('Octane worker memory high: ' . round($memory / 1024 / 1024, 2) . 'MB');
-            }
-        })->seconds(30);
     }
 
     /**
diff --git a/config/app.php b/config/app.php
index 72088b34ab..b3c5891f98 100644
--- a/config/app.php
+++ b/config/app.php
@@ -266,10 +266,6 @@
 
     'force_https' => env('FORCE_HTTPS', true),
 
-    // Enable Octane compatibility listeners when running under `php artisan octane:start`.
-    'octane_enabled' => filter_var(env('OCTANE_ENABLED', false), FILTER_VALIDATE_BOOLEAN),
-    'octane_max_requests' => (int) env('OCTANE_MAX_REQUESTS', 500),
-
     'nayra_docker_network' => env('NAYRA_DOCKER_NETWORK', 'host'),
     'nayra_port' => env('NAYRA_PORT', 8080),
 
diff --git a/config/octane.php b/config/octane.php
index 13fe63eb5e..5a9a9c642a 100644
--- a/config/octane.php
+++ b/config/octane.php
@@ -8,7 +8,7 @@
     |
     | 'flush' — Services with mutable state that must be recreated per request.
     |           These singletons will be flushed (re-bound) on each request
-    |           when OCTANE_ENABLED=true.
+    |           automatically while the application runs under Octane.
     |
     | 'warm'  — Services to pre-resolve once when an Octane worker starts,
     |           avoiding lazy-resolution overhead on the first request.
@@ -24,6 +24,8 @@
     ],
 
     'warm' => [
+        ...Laravel\Octane\Octane::defaultServicesToWarm(),
+
         // Services to pre-resolve on worker start
         ProcessMaker\Managers\PackageManager::class,
         ProcessMaker\Managers\LoginManager::class,

From c8a6a04584a112b47ed22d2cb0501b600fac34d6 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigoquelca@gmail.com>
Date: Wed, 29 Jul 2026 11:12:20 -0400
Subject: [PATCH 47/52] feat: add test for octane

---
 .../Providers/ProcessMakerServiceProvider.php | 16 +---
 .../Octane/ResetRequestStateTest.php          | 84 +++++++++++++++++++
 2 files changed, 86 insertions(+), 14 deletions(-)
 create mode 100644 tests/unit/ProcessMaker/Octane/ResetRequestStateTest.php

diff --git a/ProcessMaker/Providers/ProcessMakerServiceProvider.php b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
index c4d09de820..4d6040591f 100644
--- a/ProcessMaker/Providers/ProcessMakerServiceProvider.php
+++ b/ProcessMaker/Providers/ProcessMakerServiceProvider.php
@@ -45,13 +45,13 @@
 use ProcessMaker\ImportExport\SignalHelper;
 use ProcessMaker\Jobs\SmartInbox;
 use ProcessMaker\LicensedPackageManifest;
-use ProcessMaker\Listeners\HandleRedirectListener;
 use ProcessMaker\Managers;
 use ProcessMaker\Managers\MenuManager;
 use ProcessMaker\Managers\ScreenCompiledManager;
 use ProcessMaker\Models;
 use ProcessMaker\Multitenancy\Tenant;
 use ProcessMaker\Observers;
+use ProcessMaker\Octane\ResetRequestState;
 use ProcessMaker\PolicyExtension;
 use ProcessMaker\Providers\PermissionServiceProvider;
 use ProcessMaker\Repositories\SettingsConfigRepository;
@@ -535,15 +535,6 @@ public static function getQueryTime(): float
         return self::$queryTime;
     }
 
-    /**
-     * Reset the query time for Octane compatibility.
-     * This prevents timing metrics from leaking between requests.
-     */
-    public static function resetQueryTime(): void
-    {
-        self::$queryTime = 0;
-    }
-
     /**
      * Set the boot time for service providers.
      *
@@ -605,10 +596,7 @@ private function registerOctaneListeners(): void
             return;
         }
 
-        Event::listen(RequestTerminated::class, function () {
-            self::resetQueryTime();
-            HandleRedirectListener::reset();
-        });
+        Event::listen(RequestTerminated::class, ResetRequestState::class);
     }
 
     /**
diff --git a/tests/unit/ProcessMaker/Octane/ResetRequestStateTest.php b/tests/unit/ProcessMaker/Octane/ResetRequestStateTest.php
new file mode 100644
index 0000000000..03b4cf73a2
--- /dev/null
+++ b/tests/unit/ProcessMaker/Octane/ResetRequestStateTest.php
@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+namespace Tests\Unit\ProcessMaker\Octane;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Event;
+use Laravel\Octane\Events\RequestTerminated;
+use ProcessMaker\Events\RedirectToEvent;
+use ProcessMaker\Listeners\HandleRedirectListener;
+use ProcessMaker\Models\ProcessRequest;
+use ProcessMaker\Octane\ResetRequestState;
+use ProcessMaker\Providers\ProcessMakerServiceProvider;
+use Symfony\Component\HttpFoundation\Response;
+use Tests\TestCase;
+
+class ResetRequestStateTest extends TestCase
+{
+    public function test_it_clears_request_timing_before_the_next_request(): void
+    {
+        DB::select('SELECT 1');
+
+        $this->assertGreaterThan(0, ProcessMakerServiceProvider::getQueryTime());
+
+        $listener = new ResetRequestState();
+        $listener->handle(new RequestTerminated(
+            $this->app,
+            $this->app,
+            Request::create('/'),
+            new Response()
+        ));
+
+        $this->assertSame(0.0, ProcessMakerServiceProvider::getQueryTime());
+    }
+
+    public function test_it_prevents_redirect_state_from_leaking_into_the_next_request(): void
+    {
+        Event::fake([RedirectToEvent::class]);
+
+        $redirectListener = new RedirectStateProbe();
+        $redirectListener->queue(ProcessRequest::factory()->create());
+
+        $listener = new ResetRequestState();
+        $listener->handle(new RequestTerminated(
+            $this->app,
+            $this->app,
+            Request::create('/'),
+            new Response()
+        ));
+
+        HandleRedirectListener::sendRedirectToEvent();
+
+        Event::assertNotDispatched(RedirectToEvent::class);
+    }
+
+    public function test_octane_request_termination_automatically_resets_request_state(): void
+    {
+        Event::fake([RedirectToEvent::class]);
+
+        $redirectListener = new RedirectStateProbe();
+        $redirectListener->queue(ProcessRequest::factory()->create());
+
+        event(new RequestTerminated(
+            $this->app,
+            $this->app,
+            Request::create('/first-request'),
+            new Response()
+        ));
+
+        HandleRedirectListener::sendRedirectToEvent();
+
+        Event::assertNotDispatched(RedirectToEvent::class);
+    }
+}
+
+class RedirectStateProbe extends HandleRedirectListener
+{
+    public function queue(ProcessRequest $processRequest): void
+    {
+        $this->setRedirectTo($processRequest, 'processUpdated');
+    }
+}

From a5a035802f391198824ee10e9844bdf907a2c709 Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigoquelca@gmail.com>
Date: Wed, 29 Jul 2026 11:21:08 -0400
Subject: [PATCH 48/52] add octane resetRequestState class

---
 ProcessMaker/Octane/ResetRequestState.php       | 17 +++++++++++++++++
 .../Octane/ResetRequestStateTest.php            | 16 +++-------------
 2 files changed, 20 insertions(+), 13 deletions(-)
 create mode 100644 ProcessMaker/Octane/ResetRequestState.php

diff --git a/ProcessMaker/Octane/ResetRequestState.php b/ProcessMaker/Octane/ResetRequestState.php
new file mode 100644
index 0000000000..45071e97ad
--- /dev/null
+++ b/ProcessMaker/Octane/ResetRequestState.php
@@ -0,0 +1,17 @@
+<?php
+
+declare(strict_types=1);
+
+namespace ProcessMaker\Octane;
+
+use ProcessMaker\Listeners\HandleRedirectListener;
+use ProcessMaker\Providers\ProcessMakerServiceProvider;
+
+final class ResetRequestState
+{
+    public function handle(): void
+    {
+        ProcessMakerServiceProvider::beginRequestTiming();
+        HandleRedirectListener::reset();
+    }
+}
diff --git a/tests/unit/ProcessMaker/Octane/ResetRequestStateTest.php b/tests/unit/ProcessMaker/Octane/ResetRequestStateTest.php
index 03b4cf73a2..7895d8519f 100644
--- a/tests/unit/ProcessMaker/Octane/ResetRequestStateTest.php
+++ b/tests/unit/ProcessMaker/Octane/ResetRequestStateTest.php
@@ -25,12 +25,7 @@ public function test_it_clears_request_timing_before_the_next_request(): void
         $this->assertGreaterThan(0, ProcessMakerServiceProvider::getQueryTime());
 
         $listener = new ResetRequestState();
-        $listener->handle(new RequestTerminated(
-            $this->app,
-            $this->app,
-            Request::create('/'),
-            new Response()
-        ));
+        $listener->handle();
 
         $this->assertSame(0.0, ProcessMakerServiceProvider::getQueryTime());
     }
@@ -43,12 +38,7 @@ public function test_it_prevents_redirect_state_from_leaking_into_the_next_reque
         $redirectListener->queue(ProcessRequest::factory()->create());
 
         $listener = new ResetRequestState();
-        $listener->handle(new RequestTerminated(
-            $this->app,
-            $this->app,
-            Request::create('/'),
-            new Response()
-        ));
+        $listener->handle();
 
         HandleRedirectListener::sendRedirectToEvent();
 
@@ -75,7 +65,7 @@ public function test_octane_request_termination_automatically_resets_request_sta
     }
 }
 
-class RedirectStateProbe extends HandleRedirectListener
+final class RedirectStateProbe extends HandleRedirectListener
 {
     public function queue(ProcessRequest $processRequest): void
     {

From 741db2999ac6bb58519a7ecaddf8bf212183d02e Mon Sep 17 00:00:00 2001
From: Rodrigo <rodrigoquelca@gmail.com>
Date: Fri, 31 Jul 2026 10:26:43 -0400
Subject: [PATCH 49/52] feat: update config/octane

---
 config/octane.php | 222 +++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 210 insertions(+), 12 deletions(-)

diff --git a/config/octane.php b/config/octane.php
index 5a9a9c642a..598df4b7c6 100644
--- a/config/octane.php
+++ b/config/octane.php
@@ -1,20 +1,143 @@
 <?php
 
+use Laravel\Octane\Contracts\OperationTerminated;
+use Laravel\Octane\Events\RequestHandled;
+use Laravel\Octane\Events\RequestReceived;
+use Laravel\Octane\Events\RequestTerminated;
+use Laravel\Octane\Events\TaskReceived;
+use Laravel\Octane\Events\TaskTerminated;
+use Laravel\Octane\Events\TickReceived;
+use Laravel\Octane\Events\TickTerminated;
+use Laravel\Octane\Events\WorkerErrorOccurred;
+use Laravel\Octane\Events\WorkerStarting;
+use Laravel\Octane\Events\WorkerStopping;
+use Laravel\Octane\Listeners\CloseMonologHandlers;
+use Laravel\Octane\Listeners\CollectGarbage;
+use Laravel\Octane\Listeners\DisconnectFromDatabases;
+use Laravel\Octane\Listeners\EnsureUploadedFilesAreValid;
+use Laravel\Octane\Listeners\EnsureUploadedFilesCanBeMoved;
+use Laravel\Octane\Listeners\FlushOnce;
+use Laravel\Octane\Listeners\FlushTemporaryContainerInstances;
+use Laravel\Octane\Listeners\FlushUploadedFiles;
+use Laravel\Octane\Listeners\ReportException;
+use Laravel\Octane\Listeners\StopWorkerIfNecessary;
+use Laravel\Octane\Octane;
+
 return [
+
     /*
     |--------------------------------------------------------------------------
-    | Octane Flush & Warm Lists
+    | Octane Server
     |--------------------------------------------------------------------------
     |
-    | 'flush' — Services with mutable state that must be recreated per request.
-    |           These singletons will be flushed (re-bound) on each request
-    |           automatically while the application runs under Octane.
+    | This value determines the default "server" that will be used by Octane
+    | when starting, restarting, or stopping your server via the CLI. You
+    | are free to change this to the supported server of your choosing.
+    |
+    | Supported: "roadrunner", "swoole", "frankenphp"
+    |
+    */
+
+    'server' => env('OCTANE_SERVER', 'roadrunner'),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Force HTTPS
+    |--------------------------------------------------------------------------
     |
-    | 'warm'  — Services to pre-resolve once when an Octane worker starts,
-    |           avoiding lazy-resolution overhead on the first request.
+    | When this configuration value is set to "true", Octane will inform the
+    | framework that all absolute links must be generated using the HTTPS
+    | protocol. Otherwise your links may be generated using plain HTTP.
     |
     */
 
+    'https' => env('OCTANE_HTTPS', false),
+
+    /*
+    |--------------------------------------------------------------------------
+    | Octane Listeners
+    |--------------------------------------------------------------------------
+    |
+    | All of the event listeners for Octane's events are defined below. These
+    | listeners are responsible for resetting your application's state for
+    | the next request. You may even add your own listeners to the list.
+    |
+    */
+
+    'listeners' => [
+        WorkerStarting::class => [
+            EnsureUploadedFilesAreValid::class,
+            EnsureUploadedFilesCanBeMoved::class,
+        ],
+
+        RequestReceived::class => [
+            ...Octane::prepareApplicationForNextOperation(),
+            ...Octane::prepareApplicationForNextRequest(),
+            //
+        ],
+
+        RequestHandled::class => [
+            //
+        ],
+
+        RequestTerminated::class => [
+            // FlushUploadedFiles::class,
+        ],
+
+        TaskReceived::class => [
+            ...Octane::prepareApplicationForNextOperation(),
+            //
+        ],
+
+        TaskTerminated::class => [
+            //
+        ],
+
+        TickReceived::class => [
+            ...Octane::prepareApplicationForNextOperation(),
+            //
+        ],
+
+        TickTerminated::class => [
+            //
+        ],
+
+        OperationTerminated::class => [
+            FlushOnce::class,
+            FlushTemporaryContainerInstances::class,
+            // DisconnectFromDatabases::class,
+            // CollectGarbage::class,
+        ],
+
+        WorkerErrorOccurred::class => [
+            ReportException::class,
+            StopWorkerIfNecessary::class,
+        ],
+
+        WorkerStopping::class => [
+            CloseMonologHandlers::class,
+        ],
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Warm / Flush Bindings
+    |--------------------------------------------------------------------------
+    |
+    | The bindings listed below will either be pre-warmed when a worker boots
+    | or they will be flushed before every new request. Flushing a binding
+    | will force the container to resolve that binding again when asked.
+    |
+    */
+
+    'warm' => [
+        ...Octane::defaultServicesToWarm(),
+        // Services to pre-resolve on worker start
+        ProcessMaker\Managers\PackageManager::class,
+        ProcessMaker\Managers\LoginManager::class,
+        ProcessMaker\Managers\IndexManager::class,
+    ],
+
     'flush' => [
         // Services with mutable state that must be recreated per request
         ProcessMaker\Models\AnonymousUser::class,
@@ -23,12 +146,87 @@
         ProcessMaker\Managers\MenuManager::class,
     ],
 
-    'warm' => [
-        ...Laravel\Octane\Octane::defaultServicesToWarm(),
+    /*
+    |--------------------------------------------------------------------------
+    | Octane Swoole Tables
+    |--------------------------------------------------------------------------
+    |
+    | While using Swoole, you may define additional tables as required by the
+    | application. These tables can be used to store data that needs to be
+    | quickly accessed by other workers on the particular Swoole server.
+    |
+    */
 
-        // Services to pre-resolve on worker start
-        ProcessMaker\Managers\PackageManager::class,
-        ProcessMaker\Managers\LoginManager::class,
-        ProcessMaker\Managers\IndexManager::class,
+    'tables' => [
+        'example:1000' => [
+            'name' => 'string:1000',
+            'votes' => 'int',
+        ],
     ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Octane Swoole Cache Table
+    |--------------------------------------------------------------------------
+    |
+    | While using Swoole, you may leverage the Octane cache, which is powered
+    | by a Swoole table. You may set the maximum number of rows as well as
+    | the number of bytes per row using the configuration options below.
+    |
+    */
+
+    'cache' => [
+        'rows' => 1000,
+        'bytes' => 10000,
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | File Watching
+    |--------------------------------------------------------------------------
+    |
+    | The following list of files and directories will be watched when using
+    | the --watch option offered by Octane. If any of the directories and
+    | files are changed, Octane will automatically reload your workers.
+    |
+    */
+
+    'watch' => [
+        'app',
+        'bootstrap',
+        'config/**/*.php',
+        'database/**/*.php',
+        'public/**/*.php',
+        'resources/**/*.php',
+        'routes',
+        'composer.lock',
+        '.env',
+    ],
+
+    /*
+    |--------------------------------------------------------------------------
+    | Garbage Collection Threshold
+    |--------------------------------------------------------------------------
+    |
+    | When executing long-lived PHP scripts such as Octane, memory can build
+    | up before being cleared by PHP. You can force Octane to run garbage
+    | collection if your application consumes this amount of megabytes.
+    |
+    */
+
+    'garbage' => 50,
+
+    /*
+    |--------------------------------------------------------------------------
+    | Maximum Execution Time
+    |--------------------------------------------------------------------------
+    |
+    | The following setting configures the maximum execution time for requests
+    | being handled by Octane. You may set this value to 0 to indicate that
+    | there isn't a specific time limit on Octane request execution time.
+    |
+    */
+
+    'max_execution_time' => 30,
+
 ];

From 0e0a60bdd6952b8018021f75608b16f3597cdc65 Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Fri, 7 Aug 2026 13:56:18 -0700
Subject: [PATCH 50/52] Fix security advisories

---
 composer.json |  6 +++---
 composer.lock | 28 ++++++++++++++--------------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/composer.json b/composer.json
index 1bd4939f7f..c744e2055e 100644
--- a/composer.json
+++ b/composer.json
@@ -35,7 +35,7 @@
         "laravel/ui": "^4.6",
         "lavary/laravel-menu": "^1.8",
         "lcobucci/jwt": "^5.6",
-        "league/commonmark": "^2.8.1",
+        "league/commonmark": "^2.9.0",
         "league/flysystem-aws-s3-v3": "^3.25.1",
         "mateusjunges/laravel-kafka": "^2.11",
         "mittwald/vault-php": "^2.1",
@@ -86,7 +86,7 @@
         "laravel/boost": "^2.4",
         "mockery/mockery": "^1.6",
         "phpunit/phpunit": "^12.5.8",
-        "squizlabs/php_codesniffer": "^3.11"
+        "squizlabs/php_codesniffer": "^3.13.6"
     },
     "autoload": {
         "files": [
@@ -253,4 +253,4 @@
             "ignore": []
         }
     }
-}
\ No newline at end of file
+}
diff --git a/composer.lock b/composer.lock
index 7424e10bfa..6e9e36bd83 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "39e08dd682bb95515f53d495a677b313",
+    "content-hash": "47d1471b5383bbd226596fd2add4531b",
     "packages": [
         {
             "name": "aws/aws-crt-php",
@@ -4008,16 +4008,16 @@
         },
         {
             "name": "league/commonmark",
-            "version": "2.8.2",
+            "version": "2.9.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/thephpleague/commonmark.git",
-                "reference": "59fb075d2101740c337c7216e3f32b36c204218b"
+                "reference": "5703d83ba3da3b2e356a5fedc848ed6d8ffb6529"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/59fb075d2101740c337c7216e3f32b36c204218b",
-                "reference": "59fb075d2101740c337c7216e3f32b36c204218b",
+                "url": "https://api.github.com/repos/thephpleague/commonmark/zipball/5703d83ba3da3b2e356a5fedc848ed6d8ffb6529",
+                "reference": "5703d83ba3da3b2e356a5fedc848ed6d8ffb6529",
                 "shasum": ""
             },
             "require": {
@@ -4039,8 +4039,8 @@
                 "github/gfm": "0.29.0",
                 "michelf/php-markdown": "^1.4 || ^2.0",
                 "nyholm/psr7": "^1.5",
-                "phpstan/phpstan": "^1.8.2",
-                "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0",
+                "phpstan/phpstan": "^2.0.0",
+                "phpunit/phpunit": "^9.5.21 || ^10.5.9 || ^11.0.0 || ^12.0.0 || ^13.0.0",
                 "scrutinizer/ocular": "^1.8.1",
                 "symfony/finder": "^5.3 | ^6.0 | ^7.0 || ^8.0",
                 "symfony/process": "^5.4 | ^6.0 | ^7.0 || ^8.0",
@@ -4054,7 +4054,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.9-dev"
+                    "dev-main": "2.10-dev"
                 }
             },
             "autoload": {
@@ -4111,7 +4111,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2026-03-19T13:16:38+00:00"
+            "time": "2026-08-03T13:42:31+00:00"
         },
         {
             "name": "league/config",
@@ -16292,16 +16292,16 @@
         },
         {
             "name": "squizlabs/php_codesniffer",
-            "version": "3.13.5",
+            "version": "3.13.6",
             "source": {
                 "type": "git",
                 "url": "https://github.com/PHPCSStandards/PHP_CodeSniffer.git",
-                "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4"
+                "reference": "4c378e1a528ea066890fc2397cbdd2f94eb2fc91"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/0ca86845ce43291e8f5692c7356fccf3bcf02bf4",
-                "reference": "0ca86845ce43291e8f5692c7356fccf3bcf02bf4",
+                "url": "https://api.github.com/repos/PHPCSStandards/PHP_CodeSniffer/zipball/4c378e1a528ea066890fc2397cbdd2f94eb2fc91",
+                "reference": "4c378e1a528ea066890fc2397cbdd2f94eb2fc91",
                 "shasum": ""
             },
             "require": {
@@ -16367,7 +16367,7 @@
                     "type": "thanks_dev"
                 }
             ],
-            "time": "2025-11-04T16:30:35+00:00"
+            "time": "2026-08-06T00:17:32+00:00"
         },
         {
             "name": "staabm/side-effects-detector",

From aee6f730cfe664d249fc192cde3d28185a0b927d Mon Sep 17 00:00:00 2001
From: Nolan Ehrstrom <github@nolanpro.com>
Date: Mon, 10 Aug 2026 13:18:03 -0700
Subject: [PATCH 51/52] Update dependencies

---
 composer.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index 7b9bfc7865..95ef01d1e5 100644
--- a/composer.json
+++ b/composer.json
@@ -161,10 +161,10 @@
                 "package-ab-testing": "1.4.2",
                 "package-actions-by-email": "1.22.17",
                 "package-advanced-user-manager": "1.13.4",
-                "package-ai": "1.16.25",
+                "package-ai": "1.16.26",
                 "package-analytics-reporting": "1.11.5",
                 "package-auth": "1.24.20",
-                "package-collections": "2.27.10",
+                "package-collections": "2.27.11",
                 "package-comments": "1.16.4",
                 "package-conversational-forms": "1.15.2",
                 "package-data-sources": "1.34.13",
@@ -180,12 +180,12 @@
                 "package-product-analytics": "1.5.11",
                 "package-projects": "1.12.9",
                 "package-rpa": "1.1.2",
-                "package-savedsearch": "1.43.15",
+                "package-savedsearch": "1.43.16",
                 "package-slideshow": "1.4.3",
                 "package-smart-extract": "1.0.1",
                 "package-signature": "1.15.6",
                 "package-testing": "1.8.2",
-                "package-translations": "2.14.6",
+                "package-translations": "2.14.7",
                 "package-versions": "1.13.1",
                 "package-vocabularies": "2.17.2",
                 "package-webentry": "2.29.19",

From 18bbc29940aea796a967f11ac367771a35cd92d5 Mon Sep 17 00:00:00 2001
From: ProcessMaker Bot <206180840+processmaker-bot@users.noreply.github.com>
Date: Mon, 10 Aug 2026 20:19:07 +0000
Subject: [PATCH 52/52] Version 2026.13.2

---
 composer.json     | 6 +++---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/composer.json b/composer.json
index 95ef01d1e5..ad11ea335e 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "processmaker/processmaker",
-    "version": "2026.13.1",
+    "version": "2026.13.2",
     "description": "BPM PHP Software",
     "keywords": [
         "php bpm processmaker"
@@ -117,7 +117,7 @@
             "Gmail"
         ],
         "processmaker": {
-            "build": "3f4181f9",
+            "build": "6557348b",
             "cicd-enabled": true,
             "custom": {
                 "package-ellucian-ethos": "1.19.10",
@@ -254,4 +254,4 @@
             "ignore": []
         }
     }
-}
+}
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index e98c94133d..661ddeb413 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
     "name": "@processmaker/processmaker",
-    "version": "2026.13.1",
+    "version": "2026.13.2",
     "lockfileVersion": 2,
     "requires": true,
     "packages": {
         "": {
             "name": "@processmaker/processmaker",
-            "version": "2026.13.1",
+            "version": "2026.13.2",
             "hasInstallScript": true,
             "license": "ISC",
             "dependencies": {
diff --git a/package.json b/package.json
index c8e8ee9704..d861d535c3 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@processmaker/processmaker",
-    "version": "2026.13.1",
+    "version": "2026.13.2",
     "description": "ProcessMaker 4",
     "author": "DevOps <devops@processmaker.com>",
     "license": "ISC",