@processmaker/screen-builder 2.66.0 → 2.68.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.66.0",
+  "version": "2.68.0",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
@@ -39,7 +39,7 @@
     "@cypress/code-coverage": "^3.8.1",
     "@fortawesome/fontawesome-free": "^5.6.1",
     "@panter/vue-i18next": "^0.15.2",
-    "@processmaker/vue-form-elements": "0.44.0",
+    "@processmaker/vue-form-elements": "0.44.1",
     "@processmaker/vue-multiselect": "^2.2.0",
     "@vue/cli-plugin-babel": "^3.6.0",
     "@vue/cli-plugin-e2e-cypress": "^4.0.3",
@@ -88,7 +88,7 @@
   },
   "peerDependencies": {
     "@panter/vue-i18next": "^0.15.0",
-    "@processmaker/vue-form-elements": "0.44.0",
+    "@processmaker/vue-form-elements": "0.44.1",
     "i18next": "^15.0.8",
     "vue": "^2.6.12",
     "vuex": "^3.1.1"

package/src/components/inspector/collection-select-list.vue

@@ -32,23 +32,33 @@
     </div>
 
     <div class="mt-3" v-if="fields.length > 1">
-      <label for="pmql">{{ $t("PMQL") }}</label>
-      <mustache-helper />
-      <b-form-textarea
-        id="pmql"
-        rows="4"
-        v-model="pmql"
-        data-cy="inspector-collection-pmql"
+      <pmql-input
+          :search-type="'collections_w_mustaches'"
+          class="mb-1"
+          data-cy="inspector-collection-pmql"
+          :input-label="'PMQL'"
+          v-model="pmql"
+          :condensed="true"
+          :ai-enabled="true"
+          :placeholder="$t('PMQL')">
+        </pmql-input>
+        <small class="form-text text-muted">{{ $t('Advanced data search') }}</small>
+    </div>
+
+    <div class="mt-3" v-if="fields.length > 1">
+      <form-checkbox
+        :label="$t('Ignore duplicates in list')"
+        v-model="unique"
+        :helper="$t('Select to show only distinct list entries if labels are repeated. Only the first value will be used if duplicate labels have different values.')"
+        data-cy="inspector-collection-isDependent"
       />
-      <small class="form-text text-muted">{{
-        $t("Add a PMQL query to filter the result list. Use `data` as prefix")
-      }}</small>
     </div>
 
   </div>
 </template>
 
 <script>
+import { debounce } from "lodash";
 import _ from "lodash";
 import MustacheHelper from "./mustache-helper";
 import ScreenVariableSelector from '../screen-variable-selector.vue';
@@ -58,6 +68,7 @@ const CONFIG_FIELDS = [
   "labelField",
   "valueField",
   "pmql",
+  "unique",
 ];
 
 export default {
@@ -74,6 +85,7 @@ export default {
       labelField: null,
       valueField: null,
       pmql: "",
+      unique: false,
     };
   },
   watch: {
@@ -98,6 +110,11 @@ export default {
       deep: true
     }
   },
+  created() {
+    this.onDebouncedPmqlChange = debounce((pmql) => {
+      this.onPmqlChange(pmql);
+    }, 1000);
+  },
   computed: {
     options() {
       return Object.fromEntries(CONFIG_FIELDS.map(field => [field, this[field]]));
@@ -140,6 +157,12 @@ export default {
             })
           ];
         });
+    },
+    onNLQConversion(pmql) {
+      this.pmql = pmql;
+    },
+    onPmqlChange(pmql) {
+      this.pmql = pmql;
     }
   },
   mounted() {

package/src/components/inspector/options-list.vue

@@ -230,12 +230,10 @@
         :search-type="'collections'"
         class="mb-1"
         :input-label="'PMQL'"
-        :value="pmqlQuery"
+        v-model="pmqlQuery"
         :condensed="true"
         :ai-enabled="true"
-        :placeholder="$t('PMQL')"
-        @submit="onNLQConversion"
-        @pmqlchange="onDebouncedPmqlChange">
+        :placeholder="$t('PMQL')">
       </pmql-input>
       <small class="form-text text-muted">{{ $t('Advanced data search') }}</small>
     </div>

package/src/components/watchers-form.vue

@@ -24,24 +24,6 @@
               aria-required="true"
             />
 
-            <!-- <form-multi-select
-              :name="$t('Variable to Watch')"
-              :label="$t('Variable to Watch') + ' *'"
-              :options="variables"
-              :taggable="true"
-              v-model="config.watching"
-              :placeholder="$t('None')"
-              :multiple="false"
-              :show-labels="false"
-              :internal-search="true"
-              :validation="ruleWatcherVariable"
-              :helper="$t('Select the variable to watch on this screen or type any request variable name')"
-              @open="loadVariables"
-              @tag="addTag"
-              :tag-placeholder="$t('Press enter to use this variable')"
-              data-cy="watchers-watcher-variable"
-              ref="watching"
-            /> -->
             <screen-variable-selector
               :name="$t('Variable to Watch')"
               :label="$t('Variable to Watch') + ' *'"