From cdb855a23fed06d9308ab3547ca9347cea8e93c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Busso?=
 <90727999+agustinbusso@users.noreply.github.com>
Date: Mon, 10 Jun 2024 15:30:54 -0300
Subject: [PATCH 1/2] Fix search type for PMQL

---
 src/components/inspector/options-list.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/inspector/options-list.vue b/src/components/inspector/options-list.vue
index 0ec21049c..bc10a60c6 100644
--- a/src/components/inspector/options-list.vue
+++ b/src/components/inspector/options-list.vue
@@ -227,7 +227,7 @@
 
     <div v-if="dataSource === dataSourceValues.dataConnector">
       <pmql-input
-        :search-type="'collections'"
+        :search-type="'collections_w_mustaches'"
         class="mb-1"
         :input-label="'PMQL'"
         v-model="pmqlQuery"

From f762662c56f38ceef4c55938b799a8851455ec0c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Agust=C3=ADn=20Busso?=
 <90727999+agustinbusso@users.noreply.github.com>
Date: Mon, 10 Jun 2024 15:31:21 -0300
Subject: [PATCH 2/2] Add nonce to use last endpoint call. Fix issue with
 cacheEnabled

---
 src/DataProvider.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/DataProvider.js b/src/DataProvider.js
index e941b7f98..775b7a17d 100644
--- a/src/DataProvider.js
+++ b/src/DataProvider.js
@@ -173,7 +173,7 @@ export default {
    * @param {object} params
    * @returns {object}
    */
-  getDataSource(dataSourceId, params) {
+  getDataSource(dataSourceId, params, nonce = null) {
     // keep backwards compatibility
     if (
       !window.ProcessMaker.screen.cacheEnabled &&
@@ -190,7 +190,7 @@ export default {
         pmds_data: JSON.stringify(params.data)
       }
     }).then((response) => {
-      return response;
+      return [response, nonce];
     });
   },
 
@@ -246,7 +246,7 @@ export default {
   },
 
   getCollectionRecords(collectionId, options, nonce = null) {
-    options.useCache = window.ProcessMaker.screen.cacheEnabled;
+    options.useCache = window.ProcessMaker?.screen?.cacheEnabled;
 
     return this.get(
       `/collections/${collectionId}/records${this.authQueryString()}`,