@processmaker/screen-builder 3.1.1 → 3.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "3.1.1",
+  "version": "3.2.1",
   "scripts": {
     "dev": "VITE_COVERAGE=true vite",
     "build": "vite build",

package/src/components/inspector/collection-data-source.vue

@@ -1,26 +1,25 @@
 <template>
+  <div>
     <div>
-      <div>
-        <label for="collectionsource">{{ $t("Source of Record List") }}</label>
-        <b-form-select
-          id="collectionsource"
-          v-model="sourceOptions"
-          :options="sourceDisplayOptions"
-          data-cy="inspector-collection-data-source"
-          @change="displayOptionChange"
-        />
-        <small class="mt-3 form-text text-muted">{{
-        $t("A record list can display the data of a defined variable or a collection")
-      }}</small>
-      </div>
-      <div class="mt-2" v-if="sourceOptions === 'Collection'">
-
-         <CollectionRecordsList 
-         v-model="collectionFields"
-         :record-pmql="pmql"
-         @change="collectionChanged"/>
-
-         <pmql-input
+      <label for="collectionsource">{{ $t("Source of Record List") }}</label>
+      <b-form-select
+        id="collectionsource"
+        v-model="sourceOptions"
+        :options="sourceDisplayOptions"
+        data-cy="inspector-collection-data-source"
+        @change="displayOptionChange"
+      />
+      <small class="mt-3 form-text text-muted">
+        {{ $t("A record list can display the data of a defined variable or a collection") }}
+      </small>
+    </div>
+    <div v-if="sourceOptions === 'Collection'" class="mt-2">
+      <CollectionRecordsList
+        v-model="collectionFields"
+        :record-pmql="pmql"
+        @change="collectionChanged"
+      />
+      <pmql-input
         v-model="pmql"
         :search-type="'collections_w_mustaches'"
         class="mt-3 mb-1"
@@ -31,172 +30,171 @@
         :placeholder="$t('PMQL')"
       >
       </pmql-input>
-      <small class="mt-3 form-text text-muted">{{
-        $t("Leave this field empty to show all the records of the collection")
-      }}</small>
-        <label class="mt-3" id="data-selection">{{ $t("Data Selection") }}</label>
-
+      <small class="mt-3 form-text text-muted">
+        {{ $t("Leave this field empty to show all the records of the collection") }}
+      </small>
+      <label for="data-selection" class="mt-3">{{ $t("Data Selection") }}</label>
+      <b-form-select
+        id="data-selection"
+        v-model="dataSelectionOptions"
+        :options="dataSelectionDisplayOptions"
+        data-cy="inspector-collection-data-selection"
+      />
+      <small class="mt-3 form-text text-muted">
+        {{ $t("The user can select specific data to be stored into a variable") }}
+      </small>
+      <div v-if="dataSelectionOptions === 'single-field'" class="mt-3">
+        <label for="single-columns">{{ $t("Column") }}</label>
         <b-form-select
-          id="data-selection"
-          v-model="dataSelectionOptions"
-          :options="dataSelectionDisplayOptions"
-          data-cy="inspector-collection-data-selection"
-        />
-        <small class="mt-3 form-text text-muted">{{
-        $t("The user can select specific data to be stored into a variable")
-      }}</small>
-
-        <div class="mt-3" v-if="dataSelectionOptions === 'single-field'">
-          <label id="single-columns">{{ $t('Column') }}</label>
-          <b-form-select
           id="single-columns"
           v-model="singleField"
           :options="singleFieldOptions"
           data-cy="inspector-collection-single-field"
         >
-        <option disabled value="">{{ $t("Select a column") }}</option>
-          </b-form-select>
-        </div>
+          <option disabled value="">{{ $t("Select a column") }}</option>
+        </b-form-select>
       </div>
     </div>
-  </template>
-  <script>
-
-  import CollectionRecordsList from "./collection-records-list.vue"
-  import { cloneDeep } from "lodash";
+  </div>
+</template>
+<script>
+import { cloneDeep } from "lodash";
+import CollectionRecordsList from "./collection-records-list.vue";
 
-  const CONFIG_FIELDS = [
-    "collectionFields",
-    "collectionFieldsColumns",
-    "pmql",
-    "sourceOptions",
-    "variableStore",
-    "dataSelectionOptions",
-    "singleField"
-  ];
-  export default {
-    components: {
-      CollectionRecordsList
-    },
-    props: ["value", "screenType"],
-    data() {
-      return {
-        fields: [],
-        sourceOptions: "Variable",
-        submitCollectionCheck: true,
-        sourceDisplayOptions: [],
-        collectionFields: [],
-        collectionFieldsColumns: [],
-        variableStore: null,
-        pmql: null,
-        sourceDisplayOptions: [
+const CONFIG_FIELDS = [
+  "collectionFields",
+  "collectionFieldsColumns",
+  "pmql",
+  "sourceOptions",
+  "variableStore",
+  "dataSelectionOptions",
+  "singleField"
+];
+export default {
+  components: {
+    CollectionRecordsList
+  },
+  props: ["value", "screenType"],
+  data() {
+    return {
+      fields: [],
+      sourceOptions: "Variable",
+      submitCollectionCheck: true,
+      collectionFields: [],
+      collectionFieldsColumns: [],
+      variableStore: null,
+      pmql: null,
+      sourceDisplayOptions: [
         {
-          text: this.$t('Variable'),
-          value: 'Variable',
+          text: this.$t("Variable"),
+          value: "Variable"
         },
         {
-          text: this.$t('Collection'),
-          value: 'Collection',
-        },
+          text: this.$t("Collection"),
+          value: "Collection"
+        }
       ],
       dataSelectionDisplayOptions: [
         {
-          text: this.$t('Do not allow selection'),
-          value: 'no-selection',
+          text: this.$t("Do not allow selection"),
+          value: "no-selection"
         },
         {
-          text: this.$t('Single field of record'),
-          value: 'single-field',
+          text: this.$t("Single field of record"),
+          value: "single-field"
         },
         {
-          text: this.$t('Single record'),
-          value: 'single-record',
+          text: this.$t("Single record"),
+          value: "single-record"
         },
         {
-          text: this.$t('Multiple records'),
-          value: 'multiple-records',
-        },
+          text: this.$t("Multiple records"),
+          value: "multiple-records"
+        }
       ],
-      dataSelectionOptions: "no-selection", 
+      dataSelectionOptions: "no-selection",
       collectionColumns: [],
       singleFieldOptions: [],
       singleField: null
-      };
-    },
-    methods: {
-      displayOptionChange() {
-        this.collectionFields = [];
-        this.collectionFieldsColumns = [];
-        this.pmql = null;
-        this.$root.$emit("collection-changed", true);
-      },
-      collectionChanged(data) {
-        if (Array.isArray(data)) {
-            const [firstItem] = data;
-            const collectionId = firstItem?.collection_id;
-            if(collectionId !== this.collectionFields.collectionId) {
-              this.$root.$emit("collection-changed", true);
-            }
-        }
-      },
-      getCollectionColumns(records) {
-        const [firstRecord] = records?.dataRecordList || [];
-
-        if (firstRecord?.data) {
-          const dataObject = firstRecord.data;
-
-          for (const [key, value] of Object.entries(dataObject)) {
-            this.singleFieldOptions.push({ text: key, value: key });
-          }
+    };
+  },
+  computed: {
+    options() {
+      return Object.fromEntries(
+        CONFIG_FIELDS.map((field) => [field, this[field]])
+      );
+    }
+  },
+  watch: {
+    value: {
+      handler(value) {
+        if (!value) {
+          return;
         }
+        CONFIG_FIELDS.forEach((field) => (this[field] = value[field]));
       },
+      immediate: true
     },
-    computed: {
-      options() {
-        return Object.fromEntries(
-          CONFIG_FIELDS.map((field) => [field, this[field]])
-        );
+    sourceOptions: {
+      handler(changeOption) {
+        this.$root.$emit("record-list-option", changeOption);
       }
     },
-    watch: {
-      value: {
-        handler(value) {
-          if (!value) {
-            return;
-          }
-          CONFIG_FIELDS.forEach((field) => (this[field] = value[field]));
-        },
-        immediate: true
-      },
-      sourceOptions: {
-        handler(changeOption) {
-           this.$root.$emit("record-list-option", changeOption);
-        }
+    collectionFields: {
+      handler(collectionFieldsData) {
+        this.getCollectionColumns(collectionFieldsData);
+        this.$root.$emit("record-list-collection", collectionFieldsData);
       },
-      collectionFields: {
-        handler(collectionFieldsData) {
-           this.getCollectionColumns(collectionFieldsData);
-           this.$root.$emit("record-list-collection", collectionFieldsData);
-        },
-        deep: true
+      deep: true
+    },
+    pmql: {
+      handler(newPmql) {
+        this.$root.$emit("change-pmql", newPmql);
+      }
+    },
+    submitCollectionCheck(newValue) {
+      this.submitCollectionCheck = newValue;
+    },
+    options: {
+      handler() {
+        this.$emit("input", this.options);
       },
-      pmql: {
-        handler(newPmql) {
-            this.$root.$emit("change-pmql", newPmql);
+      deep: true
+    },
+    dataSelectionOptions() {
+      this.singleField = null;
+    }
+  },
+  mounted() {
+    this.$root.$emit("record-list-option", this.sourceOptions);
+  },
+  methods: {
+    displayOptionChange() {
+      this.collectionFields = [];
+      this.collectionFieldsColumns = [];
+      this.pmql = null;
+      this.$root.$emit("collection-changed", true);
+    },
+    collectionChanged(data) {
+      if (Array.isArray(data)) {
+        const [firstItem] = data;
+        const collectionId = firstItem?.collection_id;
+        if (collectionId !== this.collectionFields.collectionId) {
+          this.$root.$emit("collection-changed", true);
         }
-      },
-      submitCollectionCheck(newValue) {
-        this.submitCollectionCheck = newValue;
-      },
-      options: {
-        handler() {
-          this.$emit("input", this.options);
-        },
-        deep: true
-      },
-      dataSelectionOptions() {
-        this.singleField = null;
       }
     },
-  };
-  </script>
+    getCollectionColumns(records) {
+      const [firstRecord] = records?.dataRecordList || [];
+
+      if (firstRecord?.data) {
+        const dataObject = firstRecord.data;
+
+        for (const [key] of Object.entries(dataObject)) {
+          this.singleFieldOptions.push({ text: key, value: key });
+        }
+      }
+    }
+  }
+};
+</script>

package/src/components/inspector/column-setup.vue

@@ -360,10 +360,9 @@ export default {
   mounted() {
     this.initData();
     this.$root.$on("record-list-option", (val) => {
-      this.$nextTick(()=>{
-        this.isCollection = (val === "Collection") ? true : false;
+      this.$nextTick(() => {
+        this.isCollection = val === "Collection";
       });
-      
     });
     this.$root.$on("record-list-collection", (collectionData) => {
       this.getCollectionColumns(collectionData);

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

@@ -430,7 +430,7 @@ export default {
       return this.value || 'content';
     },
     ariaLabelField() {
-      return this.optionAriaLabel || 'ariaLabel';
+      return this.ariaLabel || 'ariaLabel';
     },
     currentItemToDelete() {
       if (this.removeIndex !== null
@@ -487,7 +487,7 @@ export default {
     this.selectedEndPoint = this.options.selectedEndPoint,
     this.key = this.options.key;
     this.value = this.options.value;
-    this.optionAriaLabel = this.options.optionAriaLabel;
+    this.optionAriaLabel = this.options.ariaLabel;
     this.pmqlQuery = this.options.pmqlQuery;
     this.defaultOptionKey= this.options.defaultOptionKey;
     this.selectedOptions = this.options.selectedOptions;
@@ -549,12 +549,19 @@ export default {
       }
       this.optionsList = [];
       const that = this;
-      jsonList.forEach (item => {
-        that.optionsList.push({
-          [that.keyField]: item[that.keyField],
-          [that.valueField]: item[that.valueField],
-          [that.ariaLabelField]: item[that.ariaLabelField]
-        });
+      jsonList.forEach((item) => {
+        if (that.renderAs === "checkbox") {
+          that.optionsList.push({
+            [that.keyField]: item[that.keyField],
+            [that.valueField]: item[that.valueField],
+            [that.ariaLabelField]: item[that.ariaLabelField]
+          });
+        } else {
+          that.optionsList.push({
+            [that.keyField]: item[that.keyField],
+            [that.valueField]: item[that.valueField]
+          });
+        }
       });
       this.jsonError = '';
     },
@@ -582,7 +589,9 @@ export default {
       this.editIndex = index;
       this.optionContent = this.optionsList[index][this.valueField];
       this.optionValue = this.optionsList[index][this.keyField];
-      this.optionAriaLabel = this.optionsList[index][this.ariaLabelField];
+      if (this.renderAs === "checkbox") {
+        this.optionAriaLabel = this.optionsList[index][this.ariaLabelField];
+      }
       this.optionError = '';
     },
     showAddOption() {
@@ -602,22 +611,28 @@ export default {
           this.optionError = 'An item with the same key already exists';
           return;
         }
-        this.optionsList.push(
-          {
+        if (this.renderAs === "checkbox") {
+          this.optionsList.push({
             [this.valueField]: this.optionContent,
             [this.keyField]: this.optionValue,
-            [this.ariaLabelField]: this.optionAriaLabel,
-          }
-        );
-      }
-      else {
+            [this.ariaLabelField]: this.optionAriaLabel
+          });
+        } else {
+          this.optionsList.push({
+            [this.valueField]: this.optionContent,
+            [this.keyField]: this.optionValue
+          });
+        }
+      } else {
         if (this.optionsList.find((item, index) => { return item[that.keyField] === this.optionValue && index !== this.editIndex ; })) {
           this.optionError = 'An item with the same key already exists';
           return;
         }
         this.optionsList[this.editIndex][this.keyField] = this.optionValue;
         this.optionsList[this.editIndex][this.valueField] = this.optionContent;
-        this.optionsList[this.editIndex][this.ariaLabelField] = this.optionAriaLabel;
+        if (this.renderAs === "checkbox") {
+          this.optionsList[this.editIndex][this.ariaLabelField] = this.optionAriaLabel;
+        }
       }
 
       this.jsonData = JSON.stringify(this.optionsList);

package/src/components/screen-renderer.vue

@@ -110,6 +110,7 @@ export default {
       return this.$refs.component.getCurrentPage();
     },
     setCurrentPage(page) {
+      this.$emit("updatedPage");
       this.$refs.component.setCurrentPage(page);
     },
     afterSubmit() {

package/src/components/task.vue

@@ -32,6 +32,7 @@
             :key="refreshScreen"
             :loop-context="loopContext"
             :taskdraft="this.task"
+            @update-page-task="pageUpdate"
             @update="onUpdate"
             @after-submit="afterSubmit"
             @submit="submit"
@@ -50,6 +51,7 @@
             :watchers="screen.watchers"
             :data="requestData"
             :type="screen.type"
+            @update-page-task="pageUpdate"
             @update="onUpdate"
             @after-submit="afterSubmit"
             @submit="submit"
@@ -107,7 +109,7 @@ export default {
     alwaysAllowEditing: { type: Boolean, default: false },
     disableInterstitial: { type: Boolean, default: false },
     waitLoadingListeners: { type: Boolean, default: false },
-    isWebEntry: { type: Boolean, default: false },
+    isWebEntry: { type: Boolean, default: false }
   },
   data() {
     return {
@@ -365,6 +367,9 @@ export default {
         this.hasErrors = false;
       }
     },
+    pageUpdate() {
+      this.$emit("updated-page-core");
+    },
     resetScreenState() {
       this.loadingButton = false;
       this.disabled = false;

package/src/components/vue-form-builder.vue

@@ -411,7 +411,7 @@
                   ''
                 )}`"
                 :builder="builder"
-                :form-config="extendedPages"
+                :form-config="config"
                 :screen-type="screenType"
                 :current-page="currentPage"
                 :selected-control="selected"

package/src/components/vue-form-renderer.vue

@@ -19,6 +19,7 @@
       class="p-0"
       :loop-context="loopContext"
       :taskdraft="taskdraft"
+      @updatePage="setCurrentPage"
       @after-submit="afterSubmit"
       @submit="submit"
     />
@@ -361,6 +362,7 @@ export default {
       return this.$refs.renderer.getCurrentPage();
     },
     setCurrentPage(page) {
+      this.$emit("update-page-task");
       this.$refs.renderer.setCurrentPage(page);
     },
     onContainerObserver(entries) {

package/src/form-builder-controls.js

@@ -224,6 +224,7 @@ export default [
           optionsList: [],
           key:'value',
           value:'content',
+          ariaLabel: 'ariaLabel',
           valueTypeReturned: 'single',
         },
         helper: null,

package/src/mixins/extensions/PageNavigate.js

@@ -13,6 +13,7 @@ export default {
         if (!this.$parent.definition.config[page]) {
           return;
         }
+        this.$parent.$emit("updatePage");
         this.currentPage__ = page;
       };
     },