@processmaker/screen-builder 2.62.0 → 2.64.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@processmaker/screen-builder",
-  "version": "2.62.0",
+  "version": "2.64.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.42.0",
+    "@processmaker/vue-form-elements": "0.43.0",
     "@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.42.0",
+    "@processmaker/vue-form-elements": "0.43.0",
     "i18next": "^15.0.8",
     "vue": "^2.6.12",
     "vuex": "^3.1.1"

package/src/App.vue

@@ -400,6 +400,10 @@ export default {
       return warnings;
     },
   },
+  created() {
+    this.updateDataInput = debounce(this.updateDataInput, 1000);
+    this.updateDataPreview = debounce(this.updateDataPreview, 1000);
+  },
   mounted() {
     this.countElements = debounce(this.countElements, 2000);
     if (globalObject.ProcessMaker && globalObject.ProcessMaker.user && globalObject.ProcessMaker.user.lang) {
@@ -422,10 +426,9 @@ export default {
   },
   methods: {
     ...mapMutations("globalErrorsModule", { setStoreMode: "setMode" }),
-    // eslint-disable-next-line func-names
-    updateDataInput: debounce(function () {
+    updateDataInput() {
       this.updateDataInputNow();
-    }, 1000),
+    },
     updateDataInputNow() {
       if (this.previewInputValid) {
         // Copy data over
@@ -433,10 +436,9 @@ export default {
         this.updateDataPreview();
       }
     },
-    // eslint-disable-next-line func-names
-    updateDataPreview: debounce(function () {
+    updateDataPreview() {
       this.previewDataStringify = JSON.stringify(this.previewData, null, 2);
-    }, 1000),
+    },
     monacoMounted(editor) {
       this.editor = editor;
       this.editor.updateOptions({ readOnly: true });

package/src/components/renderer/file-download.vue

@@ -45,6 +45,11 @@ export default {
       // Not somewhere we can download anything (like web entry start event)
       return;
     }
+
+    if (this.collection && this.value) {
+      // eslint-disable-next-line vue/no-mutating-props
+      this.value.file_name = this.value.name;
+    }
     this.setFilesInfo();
   },
   watch: {
@@ -114,6 +119,9 @@ export default {
 
       if (_.has(window, 'PM4ConfigOverrides.useDefaultUrlDownload') && window.PM4ConfigOverrides.useDefaultUrlDownload) {
         // Use default endpoint when coming from a package.
+        if (this.requestId) {
+          return `requests/${this.requestId}/files/${file.id}/contents`;
+        }
         return `../files/${file.id}/contents`;
       }
 
@@ -202,10 +210,7 @@ export default {
         if (fileInfo) {
           this.filesInfo.push(fileInfo);
         } else {
-          window.ProcessMaker.alert(
-            this.$t('File ID does not exist'),
-            'danger'
-          );
+          console.log(this.$t('File ID does not exist'));
         }
       });
     },

package/src/components/renderer/file-upload.vue

@@ -111,6 +111,12 @@ export default {
     this.setPrefix();
     if (this.$refs['uploader']) {
       this.$refs['uploader'].$forceUpdate();
+      // Re-upload stored files; 
+      // Files disappear when navigating between pages with the Page Navigation component
+      if (this.files.length > 0) {
+        this.$refs.uploader.uploader.addFiles(this.files);
+        this.uploading = false;
+      }
     }
 
     this.disabled = _.get(window, 'ProcessMaker.isSelfService', false);
@@ -288,6 +294,7 @@ export default {
       files: [],
       nativeFiles: {},
       uploading: false,
+      invalidFile: false,
     };
   },
   methods: {
@@ -450,6 +457,14 @@ export default {
         file.ignored = true;
         return false;
       }
+      if (file.fileType === undefined) {
+        const existingFile = this.files.find(el => {
+          if (el.name === file.name) {
+            return el.fileType;
+          }
+        });
+        file.fileType = existingFile.fileType;
+      }
 
       if (this.filesAccept) {
         file.ignored = true;
@@ -457,6 +472,8 @@ export default {
           file.ignored = false;
         }
         if (file.ignored) {
+          this.invalidFile = true;
+          this.uploading = false;
           window.ProcessMaker.alert(this.$t('File not allowed.'), 'danger');
           return false;
         }
@@ -493,6 +510,9 @@ export default {
           id,
           file_name: name,
           mime_type: rootFile.fileType,
+          // additional properties needed when re-uploading files to the uploader component
+          name: name,
+          fileType: rootFile.fileType,
         };
 
         this.$set(this.nativeFiles, id, rootFile);
@@ -521,6 +541,11 @@ export default {
       return null;
     },
     start() {
+      // Prevent the upload from being started when the file is invalid.
+      if (this.invalidFile) {
+        return;
+      }
+
       this.uploading = true;
       if (this.parentRecordList(this) === null) {
         this.row_id = null;

package/src/components/task.vue

@@ -230,7 +230,7 @@ export default {
       }
     },
     loadTask() {
-      const url = `/${this.taskId}?include=data,user,requestor,processRequest,component,screen,requestData,bpmnTagName,interstitial,definition,nested`;
+      const url = `/${this.taskId}?include=data,user,requestor,processRequest,component,screen,requestData,bpmnTagName,interstitial,definition,nested,userRequestPermission`;
       // For Vocabularies
       if (window.ProcessMaker && window.ProcessMaker.packages && window.ProcessMaker.packages.includes('package-vocabularies')) {
         window.ProcessMaker.VocabulariesSchemaUrl = `vocabularies/task_schema/${this.taskId}`;
@@ -326,7 +326,7 @@ export default {
             this.taskId = task.id;
             this.nodeId = task.element_id;
           } else if (this.parentRequest && ['COMPLETED', 'CLOSED'].includes(this.task.process_request.status)) {
-            this.$emit('completed', this.parentRequest);
+            this.$emit('completed', this.getAllowedRequestId());
           }
         });
     },
@@ -379,10 +379,20 @@ export default {
       // This may no longer be needed
     },
     processCompleted() {
+      let requestId;
       if (this.parentRequest) {
-        this.$emit('completed', this.parentRequest);
+        requestId = this.getAllowedRequestId();
+        this.$emit('completed', requestId);
       }
-      this.$emit('completed', this.requestId);
+      if (requestId !== this.requestId) {
+        this.$emit('completed', this.requestId);
+      }
+    },
+    getAllowedRequestId() {
+      const permissions = this.task.user_request_permission || [];
+      const permission = permissions.find(item => item.process_request_id === this.parentRequest)
+      const allowed = permission && permission.allowed;
+      return allowed ? this.parentRequest : this.requestId
     },
     processUpdated: _.debounce(function(data) {
       if (

package/src/mixins/ScreenBase.js

@@ -145,7 +145,6 @@ export default {
     },
     async submitForm() {
       await this.validateNow(findRootScreen(this));
-      console.log(this.valid__, this.message__);
       if (!this.valid__) {
         window.ProcessMaker.alert(this.message__, "danger");
         // if the form is not valid the data is not emitted

package/src/store/modules/globalErrorsModule.js

@@ -31,12 +31,16 @@ function countErrors(obj) {
   return errors;
 }
 
-const updateValidationRules = async (screen, commit) => {
-  const rootScreen = findRootScreen(screen);
-  if (rootScreen !== screen) {
-    // refresh nested screen validation rules
-    await screen.loadValidationRules();
-  }
+const updateValidationRules = async (screens, commit) => {
+  const rootScreen = findRootScreen(screens[0]);
+  const awaitLoad = [];
+  screens.forEach((screen) => {
+    if (rootScreen !== screen) {
+      // refresh nested screen validation rules
+      awaitLoad.push(screen.loadValidationRules());
+    }
+  });
+  await Promise.all(awaitLoad);
   try {
     await rootScreen.loadValidationRules();
   } catch (error) {
@@ -67,7 +71,15 @@ const updateValidationRules = async (screen, commit) => {
   }
 };
 
-const updateValidationRulesDebounced = debounce(updateValidationRules, 1000);
+const updateValidationRulesDebounced = debounce(updateValidationRules, 500);
+
+const screensToValidate = [];
+const queueUpdateValidationRules = (mainScreen, commit) => {
+  if (!screensToValidate.includes(mainScreen)) {
+    screensToValidate.push(mainScreen);
+  }
+  updateValidationRulesDebounced(screensToValidate, commit);
+};
 
 const globalErrorsModule = {
   namespaced,
@@ -100,14 +112,14 @@ const globalErrorsModule = {
   },
   actions: {
     validate({ commit }, mainScreen) {
-      updateValidationRulesDebounced(mainScreen, commit);
+      queueUpdateValidationRules(mainScreen, commit);
     },
     async validateNow({ commit }, mainScreen) {
-      await updateValidationRules(mainScreen, commit);
+      await updateValidationRules([mainScreen], commit);
     },
     close({ commit }) {
       commit("basic", { key: "valid", value: true });
-    },
+    }
   }
 };